summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-02-10 08:17:10 +0200
committerLauri Ojansivu <x@xet7.org>2017-02-10 08:17:10 +0200
commit17309f60395dca37557b1b2a7187df56a946b878 (patch)
tree66df90cc60e4df6eca863a5c1430b62a0193efba /client/components
parent752f84363f885b2c9f4b825ba7ab5f4b9b62772a (diff)
parent01372ab5ccd02df037b6d1e06e430beab5e18b6c (diff)
downloadwekan-17309f60395dca37557b1b2a7187df56a946b878.tar.gz
wekan-17309f60395dca37557b1b2a7187df56a946b878.tar.bz2
wekan-17309f60395dca37557b1b2a7187df56a946b878.zip
Merge branch 'qge-patch-1' into devel
Diffstat (limited to 'client/components')
-rw-r--r--client/components/lists/list.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index e1909783..187d8ec3 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -44,7 +44,7 @@ BlazeComponent.extendComponent({
placeholder: 'minicard-wrapper placeholder',
start(evt, ui) {
ui.placeholder.height(ui.helper.height());
- EscapeActions.executeUpTo('popup');
+ EscapeActions.executeUpTo('popup-close');
boardComponent.setIsDragging(true);
},
stop(evt, ui) {