diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-11-05 19:07:49 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-11-05 19:07:49 +0100 |
commit | 5c7bbfcd598c89aee17096eda1188a1b4803bcf4 (patch) | |
tree | bdbcc16fb68722fe43486386a2ce8819e6969ec9 /program/js | |
parent | 88934b6132ac22da5a66724943837bf5cae82779 (diff) |
Fix regression where child messages on collapsed thread weren't selected
on move/delete action (#1489415)
Diffstat (limited to 'program/js')
-rw-r--r-- | program/js/list.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/program/js/list.js b/program/js/list.js index 4af01e53a..4ae6c0c66 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -895,7 +895,7 @@ select_children: function(uid) for (i=0; i<len; i++) if (!this.in_selection(children[i])) - this.select_row(children[i], CONTROL_KEY); + this.select_row(children[i], CONTROL_KEY, true); }, @@ -1135,13 +1135,15 @@ key_press: function(e) // Stop propagation so that the browser doesn't scroll rcube_event.cancel(e); return this.use_arrow_key(keyCode, mod_key); + case 32: rcube_event.cancel(e); return this.select_row(this.last_selected, mod_key, true); + case 37: // Left arrow key case 39: // Right arrow key case 107: // Plus sign on a numeric keypad - case 109: // Minus sign on a numeric keypad + case 109: // Minus sign on a numeric keypad // Stop propagation rcube_event.cancel(e); var ret = this.use_plusminus_key(keyCode, mod_key); @@ -1150,20 +1152,26 @@ key_press: function(e) this.triggerEvent('keypress'); this.modkey = 0; return ret; + case 36: // Home this.select_first(mod_key); return rcube_event.cancel(e); + case 35: // End this.select_last(mod_key); return rcube_event.cancel(e); + case 27: if (this.drag_active) return this.drag_mouse_up(e); + if (this.col_drag_active) { this.selected_column = null; return this.column_drag_mouse_up(e); } + return rcube_event.cancel(e); + default: this.key_pressed = keyCode; this.modkey = mod_key; |