summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js11
-rw-r--r--program/js/common.js10
-rw-r--r--program/js/list.js15
3 files changed, 18 insertions, 18 deletions
diff --git a/program/js/app.js b/program/js/app.js
index b951aa591..e62bd00d4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -86,7 +86,7 @@ function rcube_webmail()
if (over) button_prop.over = over;
this.buttons[command].push(button_prop);
-
+
if (this.loaded)
init_button(command, button_prop);
};
@@ -1522,11 +1522,12 @@ function rcube_webmail()
this.msglist_keypress = function(list)
{
+ if (list.modkey == CONTROL_KEY)
+ return;
+
if (list.key_pressed == list.ENTER_KEY)
this.command('show');
- else if (list.key_pressed == list.DELETE_KEY)
- this.command('delete');
- else if (list.key_pressed == list.BACKSPACE_KEY)
+ else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
this.command('delete');
else if (list.key_pressed == 33)
this.command('previouspage');
@@ -2496,7 +2497,7 @@ function rcube_webmail()
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
- if (list && list.shiftkey) {
+ if (list && list.modkey == SHIFT_KEY) {
if (confirm(this.get_label('deletemessagesconfirm')))
this.permanently_remove_messages();
}
diff --git a/program/js/common.js b/program/js/common.js
index c5f466ae7..0011feaa0 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -171,14 +171,12 @@ get_modifier: function(e)
var opcode = 0;
e = e || window.event;
- if (bw.mac && e) {
+ if (bw.mac && e)
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
- if (e) {
+ else if (e)
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
+
+ return opcode;
},
/**
diff --git a/program/js/list.js b/program/js/list.js
index 874f8f73e..f0e1c9bc1 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -36,7 +36,7 @@ function rcube_list_widget(list, p)
this.colcount = 0;
this.subject_col = -1;
- this.shiftkey = false;
+ this.modkey = 0;
this.multiselect = false;
this.multiexpand = false;
this.multi_selecting = false;
@@ -648,7 +648,7 @@ select_row: function(id, mod_key, with_mouse)
case CONTROL_KEY:
if (!with_mouse)
this.highlight_row(id, true);
- break;
+ break;
case CONTROL_SHIFT_KEY:
this.shift_select(id, true);
@@ -962,7 +962,7 @@ key_press: function(e)
switch (keyCode) {
case 40:
- case 38:
+ case 38:
case 63233: // "down", in safari keypress
case 63232: // "up", in safari keypress
// Stop propagation so that the browser doesn't scroll
@@ -976,7 +976,9 @@ key_press: function(e)
rcube_event.cancel(e);
var ret = this.use_plusminus_key(keyCode, mod_key);
this.key_pressed = keyCode;
+ this.modkey = mod_key;
this.triggerEvent('keypress');
+ this.modkey = 0;
return ret;
case 36: // Home
this.select_first(mod_key);
@@ -985,11 +987,10 @@ key_press: function(e)
this.select_last(mod_key);
return rcube_event.cancel(e);
default:
- this.shiftkey = e.shiftKey;
this.key_pressed = keyCode;
+ this.modkey = mod_key;
this.triggerEvent('keypress');
- // reset shiftkey flag, we need it only for registered events
- this.shiftkey = false;
+ this.modkey = 0;
if (this.key_pressed == this.BACKSPACE_KEY)
return rcube_event.cancel(e);
@@ -1044,7 +1045,7 @@ use_arrow_key: function(keyCode, mod_key)
new_row = this.get_prev_row();
if (new_row) {
- this.select_row(new_row.uid, mod_key, true);
+ this.select_row(new_row.uid, mod_key, false);
this.scrollto(new_row.uid);
}