From 5604742eb96f08da3403c4aad2436f91a7f7013c Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Thu, 30 Jul 2015 14:51:10 +0800
Subject: Bug 1189075 - keyboard shortcut for going into edit mode conflicts
 with Firefox's tab groups feature

---
 extensions/BugModal/web/bug_modal.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'extensions/BugModal')

diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 462e7cff6..a31847d32 100644
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -864,6 +864,8 @@ $(function() {
             switch(String.fromCharCode(event.which).toLowerCase()) {
                 // ctrl+e or meta+e = enter edit mode
                 case 'e':
+                    if (event.shiftKey)
+                        return;
                     // don't conflict with text input shortcut
                     if (document.activeElement.nodeNode == 'INPUT' || document.activeElement.nodeName == 'TEXTAREA')
                         return;
-- 
cgit v1.2.3-24-g4f1b