[Pkg-mozext-commits] [adblock-plus] 411/464: Fixed: Accel is always mapped to Control, no matter what the actual browser setting is

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 96f83acc9711c6626f8f45cb5beb92de5b150798
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Jan 10 16:58:53 2014 +0100

    Fixed: Accel is always mapped to Control, no matter what the actual browser setting is
    
    Review: http://codereview.adblockplus.org/4578973954605056
---
 .hgsub             | 1 -
 .hgsubstate        | 1 -
 lib/keySelector.js | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.hgsub b/.hgsub
deleted file mode 100644
index 458058a..0000000
--- a/.hgsub
+++ /dev/null
@@ -1 +0,0 @@
-jshydra = ../jshydra
diff --git a/.hgsubstate b/.hgsubstate
deleted file mode 100644
index 6ecb639..0000000
--- a/.hgsubstate
+++ /dev/null
@@ -1 +0,0 @@
-6737deead473f5b2290c3e039e935669d732ded1 jshydra
diff --git a/lib/keySelector.js b/lib/keySelector.js
index 1ce4e11..8303961 100644
--- a/lib/keySelector.js
+++ b/lib/keySelector.js
@@ -19,7 +19,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 let validModifiers =
 {
-  ACCEL: "control",
+  ACCEL: null,
   CTRL: "control",
   CONTROL: "control",
   SHIFT: "shift",
@@ -33,6 +33,7 @@ let validModifiers =
  */
 function initAccelKey()
 {
+  validModifiers.ACCEL = "control";
   try
   {
     let accelKey = Services.prefs.getIntPref("ui.key.accelKey");
@@ -45,7 +46,6 @@ function initAccelKey()
   }
   catch(e)
   {
-    validModifiers.ACCEL = "control";
     Cu.reportError(e);
   }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git