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

Wrap long lines. No need for that

Browse Source
This commit is contained in:
JC Brand 2017-03-02 23:06:40 +01:00
parent 6121a3e11c
commit a5c0d5c451
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/converse-muc.js
View File

@ -1400,15 +1400,16 @@
* case, auto-configure won't happen, regardless of * case, auto-configure won't happen, regardless of
* the settings. * the settings.
*/ */
var that = this;
if (_.isUndefined(ev) && this.model.get('auto_configure')) { if (_.isUndefined(ev) && this.model.get('auto_configure')) {
this.fetchRoomConfiguration().then(that.autoConfigureChatRoom.bind(that)); this.fetchRoomConfiguration().then(
this.autoConfigureChatRoom.bind(this));
} else { } else {
if (!_.isUndefined(ev) && ev.preventDefault) { if (!_.isUndefined(ev) && ev.preventDefault) {
ev.preventDefault(); ev.preventDefault();
} }
this.showSpinner(); this.showSpinner();
this.fetchRoomConfiguration().then(that.renderConfigurationForm.bind(that)); this.fetchRoomConfiguration().then(
this.renderConfigurationForm.bind(this));
} }
}, },
@ -1426,7 +1427,8 @@
else { else {
$nick.removeClass('error'); $nick.removeClass('error');
} }
this.$el.find('.chatroom-form-container').replaceWith('<span class="spinner centered"/>'); this.$el.find('.chatroom-form-container')
.replaceWith('<span class="spinner centered"/>');
this.join(nick); this.join(nick);
}, },
@ -1511,7 +1513,8 @@
} }
} else { } else {
this.renderNicknameForm( this.renderNicknameForm(
__("The nickname you chose is reserved or currently in use, please choose a different one.") __("The nickname you chose is reserved or "+
"currently in use, please choose a different one.")
); );
} }
}, },