- Fix messagelist focus issue when modifying status of selected messages (#1485807)

git-svn-id: https://svn.roundcube.net/trunk@2391 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 7 insertions, 4 deletions

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 9c4a0a15d..3d68b5a5c 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix messagelist focus issue when modifying status of selected messages (#1485807)
 - Support STARTTLS in IMAP connection (#1485284)
 - Fix DEL key problem in search boxes (#1485528)
 - Support several e-mail addresses per user from virtuser_file (#1485678)
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 91237662e..0aa236a6c 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1160,11 +1160,13 @@ function rcube_webmail()
     var model, li;
 
     if (this.message_list) {
-      this.message_list.blur();
+      if (!rcube_mouse_is_over(e, this.message_list.list))
+        this.message_list.blur();
       model = this.env.mailboxes;
     }
     else if (this.contact_list) {
-      this.contact_list.blur();
+      if (!rcube_mouse_is_over(e, this.contact_list.list))
+        this.contact_list.blur();
       model = this.env.address_sources;
     }
     else if (this.ksearch_value) {
@@ -1181,8 +1183,8 @@ function rcube_webmail()
 
   this.drag_start = function(list)
   {
-       this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
-       this.initialMailBoxScrollTop = document.getElementById("mailboxlist-container").scrollTop;
+    this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
+    this.initialMailBoxScrollTop = document.getElementById("mailboxlist-container").scrollTop;
 
     var model = this.task == 'mail' ? this.env.mailboxes : this.env.address_sources;