From 1936c58bde79b61fbe6219df12f6a15decb95c59 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 13 Apr 2015 12:43:21 +0800
Subject: Bug 1152118: Shortcut for editing gets triggered even when "ctrl" and
 "e" are not pressed at the same time

---
 extensions/BugModal/web/bug_modal.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'extensions/BugModal/web/bug_modal.js')

diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index babbdbe14..bd529fab1 100644
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -732,16 +732,17 @@ $(function() {
         .change();
 
     // hotkeys
-    $('body').hotkey('ctrl+e', function() {
-        if ($('#cancel-btn:visible').length == 0) {
-            $('#mode-btn').click();
-        }
-    } );
-    $('body').hotkey('escape', function() {
-        if ($('#cancel-btn:visible').length != 0) {
-            $('#cancel-btn').click();
-        }
-    } );
+    $(window)
+        .keydown(function(event) {
+            if (!(event.ctrlKey || event.metaKey))
+                return;
+            if (String.fromCharCode(event.which).toLowerCase() == 'e') {
+                if ($('#cancel-btn:visible').length == 0) {
+                    event.preventDefault();
+                    $('#mode-btn').click();
+                }
+            }
+        });
 
     // add cc button
     $('#add-cc-btn')
-- 
cgit v1.2.3-24-g4f1b