Commit 3ad93b56 authored by JC Brand's avatar JC Brand

Clicking the wrench icon again closes the config form

parent d311e140
...@@ -54727,8 +54727,12 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_5__["default"].plugins ...@@ -54727,8 +54727,12 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_5__["default"].plugins
* case, auto-configure won't happen, regardless of * case, auto-configure won't happen, regardless of
* the settings. * the settings.
*/ */
this.showSpinner(); if (!this.config_form || !u.isVisible(this.config_form.el)) {
this.model.fetchRoomConfiguration().then(iq => this.renderConfigurationForm(iq)).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR)); this.showSpinner();
this.model.fetchRoomConfiguration().then(iq => this.renderConfigurationForm(iq)).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR));
} else {
this.closeForm();
}
}, },
checkForReservedNick() { checkForReservedNick() {
...@@ -1218,10 +1218,15 @@ converse.plugins.add('converse-muc-views', { ...@@ -1218,10 +1218,15 @@ converse.plugins.add('converse-muc-views', {
* case, auto-configure won't happen, regardless of * case, auto-configure won't happen, regardless of
* the settings. * the settings.
*/ */
this.showSpinner();
this.model.fetchRoomConfiguration() if (!this.config_form || !u.isVisible(this.config_form.el)) {
.then(iq => this.renderConfigurationForm(iq)) this.showSpinner();
.catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR)); this.model.fetchRoomConfiguration()
.then(iq => this.renderConfigurationForm(iq))
.catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR));
} else {
this.closeForm();
}
}, },
checkForReservedNick () { checkForReservedNick () {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment