summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorThomas B. <thomas@roundcube.net>2013-10-24 13:52:39 -0700
committerThomas B. <thomas@roundcube.net>2013-10-24 13:52:39 -0700
commit4e4c2511bc00cfc0214acab63b097efe142187a7 (patch)
tree9d1fefef46a57863dcfd03c3c6ff7b07f47dd418 /program/js
parentc3b6f3d8714e03878e7f2e461b3c842433ed58ab (diff)
parent52616821c89d6e3b6c90288bb642c7efc7af9bd7 (diff)
Merge pull request #143 from cmcnulty/#1489392---fix-control+arrow-behavior
#1489392 - arrow key with control down should *not* select messages
Diffstat (limited to 'program/js')
-rw-r--r--program/js/list.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/program/js/list.js b/program/js/list.js
index cb69bc462..33f88ab10 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -456,12 +456,11 @@ click_row: function(e, id)
var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
- // unselects currently selected row
- if (!this.drag_active && this.in_selection_before == id && !dblclicked)
- this.select_row(id, mod_key, false);
-
+ // selects/unselects currently selected row
+ if (!this.drag_active && !dblclicked)
+ this.select_row(id, mod_key, true);
+
this.drag_start = false;
- this.in_selection_before = false;
// row was double clicked
if (this.rowcount && dblclicked && this.in_selection(id)) {
@@ -787,7 +786,7 @@ select_row: function(id, mod_key, with_mouse)
break;
case CONTROL_KEY:
- if (!with_mouse)
+ if (with_mouse)
this.highlight_row(id, true);
break;