Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +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

2
client/components/sidebar/sidebar.js
View file

@ -184,7 +184,7 @@ var draggableMembersLabelsWidgets = function() {
snap: false, snap: false,
snapMode: 'both', snapMode: 'both',
start: function() { start: function() {
EscapeActions.executeUpTo('popup'); EscapeActions.executeUpTo('popup-back');
} }
}); });
}); });

2
client/config/router.js
View file

@ -28,7 +28,7 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
action: function(params) { action: function(params) {
Session.set('currentBoard', params.boardId); Session.set('currentBoard', params.boardId);
Session.set('currentCard', params.cardId); Session.set('currentCard', params.cardId);
EscapeActions.executeUpTo('popup'); EscapeActions.executeUpTo('popup-close');
BlazeLayout.render('defaultLayout', { content: 'board' }); BlazeLayout.render('defaultLayout', { content: 'board' });
} }

23
client/lib/escapeActions.js
View file

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

17
client/lib/popup.js
View file

@ -194,9 +194,14 @@ Popup = {
// We close a potential opened popup on any left click on the document, or go // We close a potential opened popup on any left click on the document, or go
// one step back by pressing escape. // one step back by pressing escape.
EscapeActions.register('popup', var escapeActions = ['back', 'close'];
function(evt) { Popup[evt.type === 'click' ? 'close' : 'back'](); }, _.each(escapeActions, function(actionName) {
_.bind(Popup.isOpen, Popup), { EscapeActions.register('popup-' + actionName,
noClickEscapeOn: '.js-pop-over' _.bind(Popup[actionName], Popup),
} _.bind(Popup.isOpen, Popup), {
); noClickEscapeOn: '.js-pop-over',
enabledOnClick: actionName === 'close'
}
);
});