Fix draglayer list building, so the element used as the text source can

contain any element, not only A tag or text node, but also e.g. span
pull/62/head
Aleksander Machniak 12 years ago
parent 567e45ba56
commit f41edfb91f

@ -1143,7 +1143,7 @@ drag_mouse_move: function(e)
this.draglayer.html(''); this.draglayer.html('');
// get subjects of selected messages // get subjects of selected messages
var c, i, n, subject, obj; var i, n, obj;
for (n=0; n<this.selection.length; n++) { for (n=0; n<this.selection.length; n++) {
// only show 12 lines // only show 12 lines
if (n>12) { if (n>12) {
@ -1152,37 +1152,26 @@ drag_mouse_move: function(e)
} }
if (obj = this.rows[this.selection[n]].obj) { if (obj = this.rows[this.selection[n]].obj) {
subject = ''; for (i=0; i<obj.childNodes.length; i++) {
for (c=0, i=0; i<obj.childNodes.length; i++) {
if (obj.childNodes[i].nodeName == 'TD') { if (obj.childNodes[i].nodeName == 'TD') {
if (n == 0) if (n == 0)
this.drag_start_pos = $(obj.childNodes[i]).offset(); this.drag_start_pos = $(obj.childNodes[i]).offset();
if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)) { if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == i)) {
var entry, node, tmp_node, nodes = obj.childNodes[i].childNodes; var subject = $(obj.childNodes[i]).text();
// find text node
for (m=0; m<nodes.length; m++) { if (!subject)
if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType == 3 || tmp_node.nodeName == 'A')) {
node = tmp_node;
break;
}
}
if (!node)
break; break;
subject = $(node).text();
// remove leading spaces // remove leading spaces
subject = $.trim(subject); subject = $.trim(subject);
// truncate line to 50 characters // truncate line to 50 characters
subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject); subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
entry = $('<div>').text(subject); var entry = $('<div>').text(subject);
this.draglayer.append(entry); this.draglayer.append(entry);
break; break;
} }
c++;
} }
} }
} }

Loading…
Cancel
Save