From 699a25a822276c12a0aa9253dd6a397c1b09899b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 15 Sep 2011 14:57:35 -0400
Subject: [PATCH] - 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

---
 program/js/app.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index b951aa5..e62bd00 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -86,7 +86,7 @@
     if (over) button_prop.over = over;
 
     this.buttons[command].push(button_prop);
-    
+
     if (this.loaded)
       init_button(command, button_prop);
   };
@@ -1522,11 +1522,12 @@
 
   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 @@
     // 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();
       }

--
Gitblit v1.9.1