summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-11-17 09:36:01 +0100
committerAleksander Machniak <alec@alec.pl>2014-11-17 09:36:01 +0100
commit3d8745bd0ba6a98ccac1b32a4c2fa934302d4d58 (patch)
tree3c0599ba2892f52491e5cca389e3834ee8718a69 /program/js
parenta4cdb601b70b859ae0c1fffd22cdaad2cb03113a (diff)
Fix drag-n-drop to folders expanded while dragging (#1490157)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/treelist.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/js/treelist.js b/program/js/treelist.js
index c034f77b8..08e0e686d 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -911,9 +911,9 @@ function rcube_treelist_widget(node, p)
* When dragging starts, compute absolute bounding boxes of the list and it's items
* for faster comparisons while mouse is moving
*/
- function drag_start()
+ function drag_start(force)
{
- if (drag_active)
+ if (!force && drag_active)
return;
drag_active = true;
@@ -1054,7 +1054,7 @@ function rcube_treelist_widget(node, p)
autoexpand_item = id;
autoexpand_timer = setTimeout(function() {
expand(autoexpand_item);
- drag_start(); // re-calculate item coords
+ drag_start(true); // re-calculate item coords
autoexpand_item = null;
if (ui_droppable)
$.ui.ddmanager.prepareOffsets($.ui.ddmanager.current, null);