From 3d8745bd0ba6a98ccac1b32a4c2fa934302d4d58 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 17 Nov 2014 03:36:01 -0500
Subject: [PATCH] Fix drag-n-drop to folders expanded while dragging (#1490157)
---
CHANGELOG | 4 ++++
program/js/treelist.js | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a9875fd..3a70bd0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix drag-n-drop to folders expanded while dragging (#1490157)
+
+RELEASE 1.1-beta
+----------------
- Fix skin path handling in plugin context (#1488967)
- Prevent memory exhaustion on image resizing with GD on Windows (#1489937)
- Add plugin hook for database table name lookups as requested in #1489837
diff --git a/program/js/treelist.js b/program/js/treelist.js
index c034f77..08e0e68 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -911,9 +911,9 @@
* 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 @@
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);
--
Gitblit v1.9.1