From 9806c72764e4c3f82f3b249b5456137662211e2d Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Tue, 29 Oct 2013 23:13:01 -0500 Subject: replace space bar with arrow key thread handling and switch spacebar to select messages --- program/js/list.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/program/js/list.js b/program/js/list.js index b85ea61ca..ff1b13140 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -1124,10 +1124,13 @@ 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 61: - case 107: // Plus sign on a numeric keypad (fc11 + firefox 3.5.2) - case 109: 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 // Stop propagation rcube_event.cancel(e); var ret = this.use_plusminus_key(keyCode, mod_key); @@ -1196,11 +1199,8 @@ use_plusminus_key: function(keyCode, mod_key) if (!selected_row || !selected_row.has_children) return; - if (keyCode == 32) - keyCode = selected_row.expanded ? 109 : 61; - // expand - if (keyCode == 61 || keyCode == 107) { + if (keyCode == 39 || keyCode == 107) { if (selected_row.expanded) return; -- cgit v1.2.3 From a8876fba93a1e52dd0daab6fa3b7b74fedbdc252 Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Tue, 29 Oct 2013 23:15:50 -0500 Subject: Revert "simplify home/end key behavior" This reverts commit 3bef61232bc2e0e470a66dda6d88248100fdc36f. --- program/js/list.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/program/js/list.js b/program/js/list.js index ff1b13140..5bc7c9665 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -856,8 +856,14 @@ select_first: function(mod_key) { var row = this.get_first_row(); if (row) { - this.select_row(row, mod_key, false); - this.scrollto(row); + if (mod_key) { + this.shift_select(row, mod_key); + this.triggerEvent('select'); + this.scrollto(row); + } + else { + this.select(row); + } } }, @@ -869,8 +875,14 @@ select_last: function(mod_key) { var row = this.get_last_row(); if (row) { - this.select_row(row, mod_key, false); - this.scrollto(row); + if (mod_key) { + this.shift_select(row, mod_key); + this.triggerEvent('select'); + this.scrollto(row); + } + else { + this.select(row); + } } }, -- cgit v1.2.3