From 4a051cd99f6768e634ba21a0a49f1212b9b19832 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 10 Jun 2014 09:08:16 -0400
Subject: [PATCH] Fix unintentional unselection with Ctrl+Up/Down in toggleselect mode
---
program/js/list.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index 5492c0a..d10fa22 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -65,8 +65,8 @@
this.drag_active = false;
this.col_drag_active = false;
this.column_fixed = null;
- this.last_selected = 0;
- this.shift_start = 0;
+ this.last_selected = null;
+ this.shift_start = null;
this.focused = false;
this.drag_mouse_start = null;
this.dblclick_time = 500; // default value on MS Windows is 500
@@ -293,7 +293,7 @@
this.rows = {};
this.rowcount = 0;
- this.last_selected = 0;
+ this.last_selected = null;
if (sel)
this.clear_selection();
@@ -939,13 +939,13 @@
this.multi_selecting = true;
}
- if (this.last_selected != 0 && this.rows[this.last_selected]) {
+ if (this.last_selected && this.rows[this.last_selected]) {
$(this.rows[this.last_selected].obj).removeClass('focused')
.find(this.col_tagname()).eq(this.subject_col).removeAttr('tabindex');
}
// unselect if toggleselect is active and the same row was clicked again
- if (this.toggleselect && in_selection_before) {
+ if (this.toggleselect && in_selection_before && !mod_key) {
this.clear_selection();
}
// trigger event if selection changed
@@ -1171,7 +1171,7 @@
if (num_select && !this.selection.length && !no_event) {
this.triggerEvent('select');
- this.last_selected = 0;
+ this.last_selected = null;
}
},
--
Gitblit v1.9.1