From 47653234b431c87d721eb7a20b65803dfb033066 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 15 Sep 2011 18:57:35 +0000 Subject: - Disable message list keypress operations when CTRL key is pressed, to workaround FF6 issue, where Ctrl+Pg(Up/Down) was changing list page and browser tab) - Fix multiselection with Ctrl+Up/Down keys git-svn-id: https://svn.roundcube.net/trunk@5221 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/common.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'roundcubemail/program/js/common.js') diff --git a/roundcubemail/program/js/common.js b/roundcubemail/program/js/common.js index c5f466ae7..0011feaa0 100644 --- a/roundcubemail/program/js/common.js +++ b/roundcubemail/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; }, /** -- cgit v1.2.3