Skip to content

Commit 87337ea

Browse files
committed
Bugfix. Modal auto-closes when you open it a second time
1 parent 5532a9e commit 87337ea

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
## 4.2.1 (Unreleased)
44

5-
* Bugfix. Don't set `muc_domain` for roomspanel if `locked_muc_domain` is `true`.
5+
* Bugfix: Don't set `muc_domain` for roomspanel if `locked_muc_domain` is `true`.
6+
* Bugfix: Modal auto-closes when you open it for a second time.
67

78
## 4.2.0 (2019-04-04)
89

dist/converse.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53173,6 +53173,7 @@ const _converse$env = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_
5317353173
Strophe = _converse$env.Strophe,
5317453174
Backbone = _converse$env.Backbone,
5317553175
_ = _converse$env._;
53176+
const u = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].env.utils;
5317653177
_converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-modal', {
5317753178
initialize() {
5317853179
const _converse = this._converse;
@@ -53187,7 +53188,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins
5318753188
if (!_.isNil(this.trigger_el)) {
5318853189
this.trigger_el.classList.remove('selected');
5318953190
}
53190-
}, false);
53191+
}, false); // XXX: Workaround for an apparent Bootstrap.Native bug, where
53192+
// the 'fade' class isn't removed after closing the modal,
53193+
// causing it to flash-close when you open it again.
53194+
53195+
this.el.addEventListener('shown.bs.modal', () => u.removeClass('fade', this.el), false);
5319153196
},
5319253197

5319353198
insertIntoDOM() {

src/converse-modal.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import converse from "@converse/headless/converse-core";
1010
import tpl_alert_modal from "templates/alert_modal.html";
1111

1212
const { Strophe, Backbone, _ } = converse.env;
13+
const u = converse.env.utils;
1314

1415

1516
converse.plugins.add('converse-modal', {
@@ -30,6 +31,11 @@ converse.plugins.add('converse-modal', {
3031
this.trigger_el.classList.remove('selected');
3132
}
3233
}, false);
34+
35+
// XXX: Workaround for an apparent Bootstrap.Native bug, where
36+
// the 'fade' class isn't removed after closing the modal,
37+
// causing it to flash-close when you open it again.
38+
this.el.addEventListener('shown.bs.modal', () => u.removeClass('fade', this.el), false);
3339
},
3440

3541
insertIntoDOM () {

0 commit comments

Comments
 (0)