Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-23 19:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Close the Popup when all escape actions are executed

Browse source
This commit is contained in:
Maxime Quandalle 2015-08-23 11:04:35 +02:00
parent 2248671b7c
commit d2af2ed521
4 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/lib/escapeActions.js
View file

@ -9,7 +9,8 @@ EscapeActions = {
// Executed in order
hierarchy: [
'textcomplete',
'popup',
'popup-back',
'popup-close',
'inlinedForm',
'detailsPane',
'multiselection',
@ -30,7 +31,8 @@ EscapeActions = {
priority: priority,
condition: condition,
action: action,
noClickEscapeOn: options.noClickEscapeOn
noClickEscapeOn: options.noClickEscapeOn,
enabledOnClick: !! options.enabledOnClick
});
// XXX Rewrite this with ES6: => function
this._actions = _.sortBy(this._actions, function(a) { return a.priority; });
@ -55,11 +57,12 @@ EscapeActions = {
});
},
clickExecute: function(evt, maxLabel) {
clickExecute: function(target, maxLabel) {
return this._execute({
maxLabel: maxLabel,
multipleActions: false,
evt: evt
isClick: true,
clickTarget: target
});
},
@ -72,8 +75,9 @@ EscapeActions = {
_execute: function(options) {
var maxLabel = options.maxLabel;
var evt = options.evt || {};
var multipleActions = options.multipleActions;
var isClick = !! options.isClick;
var clickTarget = options.clickTarget;
var maxPriority, currentAction;
var executedAtLeastOne = false;
@ -87,11 +91,12 @@ EscapeActions = {
if (currentAction.priority > maxPriority)
return executedAtLeastOne;
if (evt.type === 'click' && this._stopClick(currentAction, evt.target))
if (isClick && this._stopClick(currentAction, clickTarget))
return executedAtLeastOne;
if (currentAction.condition()) {
currentAction.action(evt);
var isEnabled = currentAction.enabledOnClick || ! isClick;
if (isEnabled && currentAction.condition()) {
currentAction.action();
executedAtLeastOne = true;
if (! multipleActions)
return executedAtLeastOne;
@ -153,6 +158,6 @@ Mousetrap.bindGlobal('esc', function() {
$(document).on('click', function(evt) {
if (evt.which === 1 &&
$(evt.target).closest('a,button,.is-editable').length === 0) {
EscapeActions.clickExecute(evt, 'multiselection');
EscapeActions.clickExecute(evt.target, 'multiselection');
}
});