summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-19 07:39:28 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-19 07:39:28 +0000
commit5c550057546ae32c4ef87491be9dcdbe75eba32d (patch)
treee29b8ebb384dfe73969d999550c89fdc6dde783a /roundcubemail
parent67978b159bd0bb8f76cf7a14e30629c134b668b0 (diff)
- Fix expanding folders during drag&drop (#1488260)
git-svn-id: https://svn.roundcube.net/trunk@5628 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/js/app.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 6dc891549..8513bb0cc 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix expanding folders during drag&drop (#1488260)
- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
- Add option to set default font for HTML message (#1484137)
- Fix issues with big memory allocation of IMAP results
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 7753a4101..1c24add46 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1364,7 +1364,7 @@ function rcube_webmail()
if (this.folder_auto_timer)
window.clearTimeout(this.folder_auto_timer);
- this.folder_auto_expand = k;
+ this.folder_auto_expand = this.env.mailboxes[k].id;
this.folder_auto_timer = window.setTimeout(function() {
rcmail.command('collapse-folder', rcmail.folder_auto_expand);
rcmail.drag_start(null);