Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
87337eae
Commit
87337eae
authored
Apr 06, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix. Modal auto-closes when you open it a second time
parent
5532a9ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGES.md
CHANGES.md
+2
-1
dist/converse.js
dist/converse.js
+6
-1
src/converse-modal.js
src/converse-modal.js
+6
-0
No files found.
CHANGES.md
View file @
87337eae
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
## 4.2.1 (Unreleased)
## 4.2.1 (Unreleased)
*
Bugfix. Don't set
`muc_domain`
for roomspanel if
`locked_muc_domain`
is
`true`
.
*
Bugfix: Don't set
`muc_domain`
for roomspanel if
`locked_muc_domain`
is
`true`
.
*
Bugfix: Modal auto-closes when you open it for a second time.
## 4.2.0 (2019-04-04)
## 4.2.0 (2019-04-04)
...
...
dist/converse.js
View file @
87337eae
...
@@ -53173,6 +53173,7 @@ const _converse$env = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_
...
@@ -53173,6 +53173,7 @@ const _converse$env = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_
Strophe = _converse$env.Strophe,
Strophe = _converse$env.Strophe,
Backbone = _converse$env.Backbone,
Backbone = _converse$env.Backbone,
_ = _converse$env._;
_ = _converse$env._;
const u = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].env.utils;
_converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-modal', {
_converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-modal', {
initialize() {
initialize() {
const _converse = this._converse;
const _converse = this._converse;
...
@@ -53187,7 +53188,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins
...
@@ -53187,7 +53188,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins
if (!_.isNil(this.trigger_el)) {
if (!_.isNil(this.trigger_el)) {
this.trigger_el.classList.remove('selected');
this.trigger_el.classList.remove('selected');
}
}
}, false);
}, false); // XXX: Workaround for an apparent Bootstrap.Native bug, where
// the 'fade' class isn't removed after closing the modal,
// causing it to flash-close when you open it again.
this.el.addEventListener('shown.bs.modal', () => u.removeClass('fade', this.el), false);
},
},
insertIntoDOM() {
insertIntoDOM() {
src/converse-modal.js
View file @
87337eae
...
@@ -10,6 +10,7 @@ import converse from "@converse/headless/converse-core";
...
@@ -10,6 +10,7 @@ import converse from "@converse/headless/converse-core";
import
tpl_alert_modal
from
"
templates/alert_modal.html
"
;
import
tpl_alert_modal
from
"
templates/alert_modal.html
"
;
const
{
Strophe
,
Backbone
,
_
}
=
converse
.
env
;
const
{
Strophe
,
Backbone
,
_
}
=
converse
.
env
;
const
u
=
converse
.
env
.
utils
;
converse
.
plugins
.
add
(
'
converse-modal
'
,
{
converse
.
plugins
.
add
(
'
converse-modal
'
,
{
...
@@ -30,6 +31,11 @@ converse.plugins.add('converse-modal', {
...
@@ -30,6 +31,11 @@ converse.plugins.add('converse-modal', {
this
.
trigger_el
.
classList
.
remove
(
'
selected
'
);
this
.
trigger_el
.
classList
.
remove
(
'
selected
'
);
}
}
},
false
);
},
false
);
// XXX: Workaround for an apparent Bootstrap.Native bug, where
// the 'fade' class isn't removed after closing the modal,
// causing it to flash-close when you open it again.
this
.
el
.
addEventListener
(
'
shown.bs.modal
'
,
()
=>
u
.
removeClass
(
'
fade
'
,
this
.
el
),
false
);
},
},
insertIntoDOM
()
{
insertIntoDOM
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment