summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-05 14:59:13 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-05 15:02:19 +0200
commit9404f4a7a65382a26f01cf48fd9ab43ef7b1a339 (patch)
tree648bbf7d88a4fb275ea4904c6ccc27d91b77b3ac /program/js
parent84243db8c7bcb0b6cf981a46b409b48c4005842e (diff)
Fix selecting collapsed rows when using selection with Shift/Ctrl key
Diffstat (limited to 'program/js')
-rw-r--r--program/js/list.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/program/js/list.js b/program/js/list.js
index ac3a3bf5d..6c4b861c1 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -775,10 +775,16 @@ shift_select: function(id, control)
if (!this.rows[this.shift_start] || !this.selection.length)
this.shift_start = id;
- var n, from_rowIndex = this.rows[this.shift_start].obj.rowIndex,
- to_rowIndex = this.rows[id].obj.rowIndex,
- i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex),
- j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);
+ var n, i, j, to_row = this.rows[id],
+ from_rowIndex = this.rows[this.shift_start].obj.rowIndex,
+ to_rowIndex = to_row.obj.rowIndex;
+
+ if (!to_row.expanded && to_row.has_children)
+ if (to_row = this.rows[(this.row_children(id)).pop()])
+ to_rowIndex = to_row.obj.rowIndex;
+
+ i = ((from_rowIndex < to_rowIndex) ? from_rowIndex : to_rowIndex),
+ j = ((from_rowIndex > to_rowIndex) ? from_rowIndex : to_rowIndex);
// iterate through the entire message list
for (n in this.rows) {