Changeset 2661 in subversion

Timestamp:

Jun 19, 2009 1:29:52 PM (4 years ago)

Author:

thomasb

Message:

Open collapsed folders during drag & drop (#1485914)

File:

• trunk/roundcubemail/program/js/app.js (modified) (5 diffs)

trunk/roundcubemail/program/js/app.js

@@ -1264 +1264 @@
       for (var k in model) {
         if (li = this.get_folder_li(k)) {
-          // only visible folders
+          // only visible folders
           if (height = li.firstChild.offsetHeight) {
-            pos = $(li.firstChild).offset();
-            this.env.folder_coords[k] = { x1:pos.left, y1:pos.top,
-                x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height, on:0 };
-          }
+            pos = $(li.firstChild).offset();
+            this.env.folder_coords[k] = { x1:pos.left, y1:pos.top,
+              x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height, on:0 };
+          }
         }
       }
@@ -1279 +1279 @@
     this.drag_active = false;
     this.env.last_folder_target = null;
+    
+    if (this.folder_auto_timer) {
+      window.clearTimeout(this.folder_auto_timer);
+      this.folder_auto_timer = null;
+      this.folder_auto_expand = null;
+    }
 
     // over the folders
@@ -1297 +1303 @@
       var toffset = -moffset-boffset;
 
-      var li, pos, mouse;
+      var li, div, pos, mouse;
       mouse = rcube_event.get_mouse_pos(e);
       pos = this.env.folderlist_coords;
@@ -1304 +1310 @@
       // if mouse pointer is outside of folderlist
       if (mouse.x < pos.x1 || mouse.x >= pos.x2 || mouse.y < pos.y1 || mouse.y >= pos.y2) {
-        if (this.env.last_folder_target) {
+        if (this.env.last_folder_target) {
           $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
-          this.env.folder_coords[this.env.last_folder_target].on = 0;
-          this.env.last_folder_target = null;
-        }
+          this.env.folder_coords[this.env.last_folder_target].on = 0;
+          this.env.last_folder_target = null;
+        }
         return;
       }
@@ -1316 +1322 @@
         pos = this.env.folder_coords[k];
         if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2
-            && this.check_droptarget(k)) {
-          $(this.get_folder_li(k)).addClass('droptarget');
+            && this.check_droptarget(k)) {
+
+          li = this.get_folder_li(k);
+          div = $(li.getElementsByTagName("div")[0]);
+
+          // if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
+          if (div.hasClass('collapsed')) {
+            if (this.folder_auto_timer)
+              window.clearTimeout(this.folder_auto_timer);
+            
+            this.folder_auto_expand = k;
+            this.folder_auto_timer = window.setTimeout(function() {
+                rcmail.command("collapse-folder", rcmail.folder_auto_expand);
+                rcmail.drag_start(null);
+              }, 1000);
+          }
+          
+          if (!div.hasClass('collapsed') && this.folder_auto_timer) {
+            window.clearTimeout(this.folder_auto_timer);
+            this.folder_auto_timer = null;
+            this.folder_auto_expand = null;
+          }
+          
+          $(li).addClass('droptarget');
           this.env.last_folder_target = k;
-          this.env.folder_coords[k].on = 1;
-        }
+          this.env.folder_coords[k].on = 1;
+        }
         else if (pos.on) {
-          $(this.get_folder_li(k)).removeClass('droptarget');
-          this.env.folder_coords[k].on = 0;
-        }
+          $(this.get_folder_li(k)).removeClass('droptarget');
+          this.env.folder_coords[k].on = 0;
+        }
       }
     }