diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 10:27:20 +0100 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 12:49:58 +0100 |
| commit | 2b134ff7a986eb97f8ec360321be284a7a8ea11e (patch) | |
| tree | 0ff579909b402db5916b66ec7bc7469534881a15 /client/lib/popup.js | |
| parent | 3507c6565bb16b5f45c6f269f7376902f8b1ff37 (diff) | |
| parent | 41b23f88aea0f421226f92b081cdb1b61c64bde4 (diff) | |
| download | wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.gz wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.bz2 wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.zip | |
Merge branch 'devel' into minicard-editor
Conflicts:
client/components/lists/listBody.js
Diffstat (limited to 'client/lib/popup.js')
| -rw-r--r-- | client/lib/popup.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/lib/popup.js b/client/lib/popup.js index 3c39af29..7418d938 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -91,7 +91,7 @@ window.Popup = new class { if (!self.isOpen()) { self.current = Blaze.renderWithData(self.template, () => { self._dep.depend(); - return _.extend(self._getTopStack(), { stack: self._stack }); + return { ...self._getTopStack(), stack: self._stack }; }, document.body); } else { @@ -191,7 +191,7 @@ window.Popup = new class { // We close a potential opened popup on any left click on the document, or go // one step back by pressing escape. const escapeActions = ['back', 'close']; -_.each(escapeActions, (actionName) => { +escapeActions.forEach((actionName) => { EscapeActions.register(`popup-${actionName}`, () => Popup[actionName](), () => Popup.isOpen(), |