summaryrefslogtreecommitdiffstats
path: root/client/lib
diff options
context:
space:
mode:
authorAngelo Gallarello <angelo.gallarell@gmail.com>2018-12-31 00:45:11 +0100
committerAngelo Gallarello <angelo.gallarell@gmail.com>2018-12-31 00:45:11 +0100
commit196fef3a1bca7d2d4fbb07e6134c1de2a4338a97 (patch)
tree6705ca5d2163fcf4901a5afa8539f1c93a9a2be0 /client/lib
parenta2d756074f05299248944ecce2cc87a9a28ab020 (diff)
downloadwekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.tar.gz
wekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.tar.bz2
wekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.zip
Added popup
Diffstat (limited to 'client/lib')
-rw-r--r--client/lib/popup.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 516ce849..5b640f50 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -27,11 +27,9 @@ window.Popup = new class {
open(name) {
const self = this;
const popupName = `${name}Popup`;
-
function clickFromPopup(evt) {
return $(evt.target).closest('.js-pop-over').length !== 0;
}
-
return function(evt) {
// If a popup is already opened, clicking again on the opener element
// should close it -- and interrupt the current `open` function.
@@ -57,7 +55,6 @@ window.Popup = new class {
self._stack = [];
openerElement = evt.currentTarget;
}
-
$(openerElement).addClass('is-active');
evt.preventDefault();
@@ -139,6 +136,7 @@ window.Popup = new class {
const openerElement = this._getTopStack().openerElement;
$(openerElement).removeClass('is-active');
+
this._stack = [];
}
}
@@ -200,7 +198,7 @@ escapeActions.forEach((actionName) => {
() => Popup[actionName](),
() => Popup.isOpen(),
{
- noClickEscapeOn: '.js-pop-over',
+ noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup',
enabledOnClick: actionName === 'close',
}
);