Changeset 2538 in subversion

Timestamp:

May 26, 2009 3:28:42 AM (4 years ago)

Author:

alec

Message:

• Add drag cancelling with ESC key (#1484344)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (3 diffs)
• program/js/list.js (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Add drag cancelling with ESC key (#1484344)
 - Support initial identity name from virtuser_query (#1484003)
 - Added message menu, removed Print and Source buttons

trunk/roundcubemail/program/js/app.js

@@ -163 +163 @@
           this.message_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
           this.message_list.addEventListener('dragmove', function(o, e){ p.drag_move(e); });
-          this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
+          this.message_list.addEventListener('dragend', function(o, e){ p.drag_end(e); });
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
 
@@ -279 +279 @@
           this.contact_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
           this.contact_list.addEventListener('dragmove', function(o, e){ p.drag_move(e); });
-          this.contact_list.addEventListener('dragend', function(o){ p.drag_active = false; });
+          this.contact_list.addEventListener('dragend', function(o, e){ p.drag_end(e); });
           this.contact_list.init();
 
@@ -1259 +1259 @@
   };
 
+  this.drag_end = function(e)
+  {
+    this.drag_active = false;
+
+    // over the folders
+    if (this.gui_objects.folderlist && this.env.folder_coords) {
+      for (var k in this.env.folder_coords) {
+        if (k == this.env.last_folder_target) {
+          $(this.get_folder_li(k)).removeClass('droptarget');
+          this.env.last_folder_target = null;
+        }
+      }
+    }
+  };
+  
   this.drag_move = function(e)
   {

trunk/roundcubemail/program/js/list.js

@@ -626 +626 @@
   var keyCode = rcube_event.get_keycode(e);
   var mod_key = rcube_event.get_modifier(e);
+
   switch (keyCode)
   {
@@ -654 +655 @@
   switch (rcube_event.get_keycode(e))
   {
+    case 27:
+      if (this.drag_active)
+        this.drag_mouse_up(e);
     case 40:
     case 38: