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 +++++++++++----------
 js/jquery/plugins/hotkeys/hotkeys-min.js |  2 --
 2 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 js/jquery/plugins/hotkeys/hotkeys-min.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')
diff --git a/js/jquery/plugins/hotkeys/hotkeys-min.js b/js/jquery/plugins/hotkeys/hotkeys-min.js
deleted file mode 100644
index f6ecc01db..000000000
--- a/js/jquery/plugins/hotkeys/hotkeys-min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/adrianmalik/jquery-hotkeys
-jQuery.fn.hotkey=function(keys,func){var element=$(this[0]);var specialKeyCodes={8:"backspace",9:"tab",13:"enter",16:"shift",17:"ctrl",18:"alt",19:"break",20:"caps lock",27:"escape",33:"page up",34:"page down",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"delete",96:"numpad 0",97:"numpad 1",98:"numpad 2",99:"numpad 3",100:"numpad 4",101:"numpad 5",102:"numpad 6",103:"numpad 7",104:"numpad 8",105:"numpad 9",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12"};keys=$.trim(keys);if(typeof keys!=="string"){throw"Keys parameter must be a string for jquery hotkeys"}if(keys===""){throw"Keys parameter cannot be empty"}if(keys.indexOf("+")==-1){var arr=[];arr.push(keys);keys=arr}else{keys=keys.split("+")}var keysCount=keys.length;if(keysCount>2){throw"jQuery hotkey supports only maximal combination with two keys like ctrl+c"}var validateFirstKey=false;element.keydown(function(event){var keyCode=event.keyCode;var ch="";if(typeof specialKeyCodes[keyCode]!=="undefined"){ch=specialKeyCodes[keyCode]}else{ch=String.fromCharCode(keyCode).toLowerCase()}if(keysCount===1&&ch===keys[0]){func()}if(keysCount===2&&ch===keys[0]){validateFirstKey=true}}).keyup(function(event){if(validateFirstKey){var keyCode=event.keyCode;var ch="";if(typeof specialKeyCodes[keyCode]!=="undefined"){ch=specialKeyCodes[keyCode]}else{ch=String.fromCharCode(keyCode).toLowerCase()}if(ch===keys[1]){func()}}})};
-- 
cgit v1.2.3-24-g4f1b