diff options
author | Maxime Quandalle <maxime@quandalle.com> | 2015-06-07 10:30:27 +0200 |
---|---|---|
committer | Maxime Quandalle <maxime@quandalle.com> | 2015-06-07 10:34:19 +0200 |
commit | 92dd05d06ddeb2a9434df6038c432e6b167c1c99 (patch) | |
tree | ecb93138c1dd0ab0c1fcf2682a6eae600a4bbca9 /client/lib/multiSelection.js | |
parent | 12919cbfc6c3fd0793624776b3afb70e3a0cdd1a (diff) | |
download | wekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.tar.gz wekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.tar.bz2 wekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.zip |
Click on the page to escape the last action
This is a generalization of what we had for closing a popup by
clicking outside of it. It now works for inlinedForms and detailsPane
as well.
Diffstat (limited to 'client/lib/multiSelection.js')
-rw-r--r-- | client/lib/multiSelection.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/client/lib/multiSelection.js b/client/lib/multiSelection.js index 53c16da0..2f96e199 100644 --- a/client/lib/multiSelection.js +++ b/client/lib/multiSelection.js @@ -78,7 +78,7 @@ MultiSelection = { activate: function() { if (! this.isActive()) { - EscapeActions.executeLowerThan('detailsPane'); + EscapeActions.executeUpTo('detailsPane'); this._isActive.set(true); Sidebar.setView(this.sidebarView); Tracker.flush(); @@ -91,6 +91,7 @@ MultiSelection = { if (Sidebar && Sidebar.getView() === this.sidebarView) { Sidebar.setView(); } + this.reset(); } }, @@ -149,11 +150,7 @@ MultiSelection = { Blaze.registerHelper('MultiSelection', MultiSelection); -EscapeActions.register('multiselection-disable', +EscapeActions.register('multiselection', function() { MultiSelection.disable(); }, function() { return MultiSelection.isActive(); } ); - -EscapeActions.register('multiselection-reset', - function() { MultiSelection.reset(); } -); |