1 files changed, 93 insertions, 53 deletions

diff --git a/program/js/list.js b/program/js/list.js
index e3a38ba7f..54daa983e 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -20,7 +20,7 @@
 
 /**
  * Roundcube List Widget class
- * @contructor
+ * @constructor
  */
 function rcube_list_widget(list, p)
 {
@@ -32,10 +32,6 @@ function rcube_list_widget(list, p)
   this.list = list ? list : null;
   this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table';
   this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i;
-  this.thead;
-  this.tbody;
-  this.fixed_header;
-  this.frame = null;
   this.rows = {};
   this.selection = [];
   this.rowcount = 0;
@@ -249,6 +245,9 @@ clear: function(sel)
   // reset scroll position (in Opera)
   if (this.frame)
     this.frame.scrollTop = 0;
+
+  // fix list header after removing any rows
+  this.resize();
 },
 
 
@@ -257,7 +256,7 @@ clear: function(sel)
  */
 remove_row: function(uid, sel_next)
 {
-  var node = this.rows[uid] ? this.rows[uid].obj : null;
+  var self = this, node = this.rows[uid] ? this.rows[uid].obj : null;
 
   if (!node)
     return;
@@ -269,6 +268,10 @@ remove_row: function(uid, sel_next)
 
   delete this.rows[uid];
   this.rowcount--;
+
+  // fix list header after removing any rows
+  clearTimeout(this.resize_timeout)
+  this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
 },
 
 
@@ -277,7 +280,7 @@ remove_row: function(uid, sel_next)
  */
 insert_row: function(row, before)
 {
-  var tbody = this.tbody;
+  var self = this, tbody = this.tbody;
 
   // create a real dom node first
   if (row.nodeName === undefined) {
@@ -305,6 +308,10 @@ insert_row: function(row, before)
 
   this.init_row(row);
   this.rowcount++;
+
+  // fix list header after adding any rows
+  clearTimeout(this.resize_timeout)
+  this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
 },
 
 /**
@@ -531,17 +538,18 @@ expand_row: function(e, id)
 
 collapse: function(row)
 {
+  var r, depth = row.depth,
+    new_row = row ? row.obj.nextSibling : null;
+
   row.expanded = false;
   this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
-  var depth = row.depth;
-  var new_row = row ? row.obj.nextSibling : null;
-  var r;
 
   while (new_row) {
     if (new_row.nodeType == 1) {
-      var r = this.rows[new_row.uid];
+      r = this.rows[new_row.uid];
       if (r && r.depth <= depth)
         break;
+
       $(new_row).css('display', 'none');
       if (r.expanded) {
         r.expanded = false;
@@ -553,6 +561,7 @@ collapse: function(row)
 
   this.resize();
   this.triggerEvent('listupdate');
+
   return false;
 },
 
@@ -950,7 +959,7 @@ _rowIndex: function(obj)
 in_selection: function(id)
 {
   for (var n in this.selection)
-    if (this.selection[n]==id)
+    if (this.selection[n] == id)
       return true;
 
   return false;
@@ -1046,9 +1055,26 @@ clear_selection: function(id)
 /**
  * Getter for the selection array
  */
-get_selection: function()
+get_selection: function(deep)
 {
-  return this.selection;
+  var res = $.merge([], this.selection);
+
+  // return children of selected threads even if only root is selected
+  if (deep !== false && res.length) {
+    for (var uid, uids, i=0, len=res.length; i<len; i++) {
+      uid = res[i];
+      if (this.rows[uid].has_children && !this.rows[uid].expanded) {
+        uids = this.row_children(uid);
+        for (var j=0, uids_len=uids.length; j<uids_len; j++) {
+          uid = uids[j];
+          if (!this.in_selection(uid))
+            res.push(uid);
+        }
+      }
+    }
+  }
+
+  return res;
 },
 
 
@@ -1292,60 +1318,71 @@ drag_mouse_move: function(e)
 
   if (this.drag_start) {
     // check mouse movement, of less than 3 pixels, don't start dragging
-    var m = rcube_event.get_mouse_pos(e);
+    var m = rcube_event.get_mouse_pos(e),
+      limit = 10, selection = [], self = this;
 
     if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
       return false;
 
+    // remember dragging start position
+    this.drag_start_pos = {left: m.x, top: m.y};
+
+    // initialize drag layer
     if (!this.draglayer)
       this.draglayer = $('<div>').attr('id', 'rcmdraglayer')
-        .css({ position:'absolute', display:'none', 'z-index':2000 })
+        .css({position: 'absolute', display: 'none', 'z-index': 2000})
         .appendTo(document.body);
+    else
+      this.draglayer.html('');
 
-    // also select childs of (collapsed) threads for dragging
-    var n, uid, selection = $.merge([], this.selection);
-    for (n in selection) {
-      uid = selection[n];
-      if (!this.rows[uid].expanded)
-        this.select_children(uid);
-    }
+    // get selected rows (in display order), don't use this.selection here
+    $(this.row_tagname() + '.selected', this.tbody).each(function() {
+      if (!String(this.id).match(self.id_regexp))
+        return;
 
-    // reset content
-    this.draglayer.html('');
+      var uid = RegExp.$1, row = self.rows[uid];
 
-    // get subjects of selected messages
-    var i, n, obj, me;
-    for (n=0; n<this.selection.length; n++) {
-      // only show 12 lines
-      if (n>12) {
-        this.draglayer.append('...');
-        break;
-      }
+      if ($.inArray(uid, selection) > -1)
+        return;
+
+      selection.push(uid);
 
-      me = this;
-      if (obj = this.rows[this.selection[n]].obj) {
-        $('> '+this.col_tagname(), obj).each(function(i,elem){
-          if (n == 0)
-            me.drag_start_pos = $(elem).offset();
+      // also handle children of (collapsed) trees for dragging (they might be not selected)
+      if (row.has_children && !row.expanded)
+        $.each(self.row_children(uid), function() {
+          if ($.inArray(this, selection) > -1)
+            return;
+          selection.push(this);
+        });
 
-          if (me.subject_col < 0 || (me.subject_col >= 0 && me.subject_col == i)) {
-            var subject = $(elem).text();
+      // break the loop asap
+      if (selection.length > limit + 1)
+        return false;
+    });
 
-            if (subject) {
-              // remove leading spaces
-              subject = $.trim(subject);
-              // truncate line to 50 characters
-              subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
+    // append subject (of every row up to the limit) to the drag layer
+    $.each(selection, function(i, uid) {
+      if (i > limit) {
+        self.draglayer.append('...');
+        return false;
+      }
 
-              var entry = $('<div>').text(subject);
-              me.draglayer.append(entry);
-            }
+      $('> ' + self.col_tagname(), self.rows[uid].obj).each(function(n, cell) {
+        if (self.subject_col < 0 || (self.subject_col >= 0 && self.subject_col == n)) {
+          var subject = $(cell).text();
 
-            return false;  // break
+          if (subject) {
+            // remove leading spaces
+            subject = $.trim(subject);
+            // truncate line to 50 characters
+            subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
+
+            self.draglayer.append($('<div>').text(subject));
+            return false;
           }
-        });
-      }
-    }
+        }
+      });
+    });
 
     this.draglayer.show();
     this.drag_active = true;
@@ -1420,6 +1457,9 @@ column_drag_mouse_move: function(e)
       var lpos = $(this.list).offset(),
         cells = this.thead.rows[0].cells;
 
+      // fix layer position when list is scrolled
+      lpos.top += this.list.scrollTop + this.list.parentNode.scrollTop;
+
       // create dragging layer
       this.col_draglayer = $('<div>').attr('id', 'rcmcoldraglayer')
         .css(lpos).css({ position:'absolute', 'z-index':2001,
@@ -1530,7 +1570,7 @@ row_children: function(uid)
 
   while (row) {
     if (row.nodeType == 1) {
-      if ((r = this.rows[row.uid])) {
+      if (r = this.rows[row.uid]) {
         if (!r.depth || r.depth <= depth)
           break;
         res.push(r.uid);