Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #264 from Deuteu/ie8

Browse Source 
[UNTESTED] Remove unnecessary commas for ie8 compatibility
This commit is contained in:
JC Brand 2014-10-28 18:12:04 +01:00
commit 299fa033d3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
converse.js
View File

@ -1599,7 +1599,7 @@
label_away: __('Away'), label_away: __('Away'),
label_offline: __('Offline'), label_offline: __('Offline'),
label_logout: __('Log out'), label_logout: __('Log out'),
allow_logout: converse.allow_logout, allow_logout: converse.allow_logout
}); });
this.$tabs.append(converse.templates.contacts_tab({label_contacts: LABEL_CONTACTS})); this.$tabs.append(converse.templates.contacts_tab({label_contacts: LABEL_CONTACTS}));
if (converse.xhr_user_search) { if (converse.xhr_user_search) {
@ -2081,7 +2081,7 @@
initialize: function (options) { initialize: function (options) {
this.browserStorage = new Backbone.BrowserStorage[converse.storage]( this.browserStorage = new Backbone.BrowserStorage[converse.storage](
b64_sha1('converse.occupants'+converse.bare_jid+options.nick)); b64_sha1('converse.occupants'+converse.bare_jid+options.nick));
}, }
}); });
this.ChatRoomOccupantsView = Backbone.Overview.extend({ this.ChatRoomOccupantsView = Backbone.Overview.extend({
@ -2171,7 +2171,7 @@
$(ev.target).typeahead('val', ''); $(ev.target).typeahead('val', '');
}, this)); }, this));
return this; return this;
}, }
}); });
@ -2212,7 +2212,7 @@
this); this);
this.occupantsview = new converse.ChatRoomOccupantsView({ this.occupantsview = new converse.ChatRoomOccupantsView({
model: new converse.ChatRoomOccupants({nick: this.model.get('nick')}), model: new converse.ChatRoomOccupants({nick: this.model.get('nick')})
}); });
this.occupantsview.chatroomview = this; this.occupantsview.chatroomview = this;
this.render(); this.render();
@ -2245,7 +2245,7 @@
.append( .append(
converse.templates.chatarea({ converse.templates.chatarea({
'show_toolbar': converse.show_toolbar, 'show_toolbar': converse.show_toolbar,
'label_message': __('Message'), 'label_message': __('Message')
})) }))
.append(this.occupantsview.render().$el); .append(this.occupantsview.render().$el);
this.renderToolbar(); this.renderToolbar();
@ -2558,7 +2558,7 @@
172: __('This room is now non-anonymous'), 172: __('This room is now non-anonymous'),
173: __('This room is now semi-anonymous'), 173: __('This room is now semi-anonymous'),
174: __('This room is now fully-anonymous'), 174: __('This room is now fully-anonymous'),
201: __('A new room has been created'), 201: __('A new room has been created')
}, },
disconnectMessages: { disconnectMessages: {
@ -3170,7 +3170,7 @@
this.set({ this.set({
'collapsed': this.get('collapsed') || false, 'collapsed': this.get('collapsed') || false,
'num_minimized': this.get('num_minimized') || 0, 'num_minimized': this.get('num_minimized') || 0,
'num_unread': this.get('num_unread') || 0, 'num_unread': this.get('num_unread') || 0
}); });
} }
}); });
@ -3196,7 +3196,7 @@
this.$flyout.show(); this.$flyout.show();
} }
return this.$el; return this.$el;
}, }
}); });
this.RosterContact = Backbone.Model.extend({ this.RosterContact = Backbone.Model.extend({
@ -3336,7 +3336,7 @@
this.$el.html(converse.templates.requesting_contact( this.$el.html(converse.templates.requesting_contact(
_.extend(item.toJSON(), { _.extend(item.toJSON(), {
'desc_accept': __("Click to accept this contact request"), 'desc_accept': __("Click to accept this contact request"),
'desc_decline': __("Click to decline this contact request"), 'desc_decline': __("Click to decline this contact request")
}) })
)); ));
converse.controlboxtoggle.showControlBox(); converse.controlboxtoggle.showControlBox();
@ -4681,6 +4681,6 @@
}, },
'registerPlugin': function (name, callback) { 'registerPlugin': function (name, callback) {
converse.plugins[name] = callback; converse.plugins[name] = callback;
}, }
}; };
})); }));