From f88d8a25664443c2420873bb883911a1c06df23a Mon Sep 17 00:00:00 2001
From: eight <eight04@gmail.com>
Date: Tue, 5 Dec 2017 09:28:13 +0800
Subject: [PATCH] Fix: keydown on input would trigger hotkeys

---
 popup/hotkeys.js | 11 ++++++++++-
 popup/popup.js   |  9 ++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/popup/hotkeys.js b/popup/hotkeys.js
index 053d7e1c..a687dceb 100644
--- a/popup/hotkeys.js
+++ b/popup/hotkeys.js
@@ -6,13 +6,22 @@ window.addEventListener('showStyles:done', function _() {
 
   let togglablesShown = true;
   let togglables = getTogglables();
+  let enabled = true;
 
   window.addEventListener('keydown', onKeyDown);
+  window.hotkeys = {
+    enable() {
+      enabled = true;
+    },
+    disable() {
+      enabled = false;
+    }
+  };
   initHotkeyInfo();
   return;
 
   function onKeyDown(event) {
-    if (event.ctrlKey || event.altKey || event.metaKey) {
+    if (event.ctrlKey || event.altKey || event.metaKey || !enabled) {
       return;
     }
     let entry;
diff --git a/popup/popup.js b/popup/popup.js
index 4b2cc090..1e732f7b 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -362,9 +362,12 @@ Object.assign(handleEvent, {
   configure(event) {
     const {styleId, styleIsUsercss} = handleEvent.getClickedStyleElement(event);
     if (styleIsUsercss) {
-      getStylesSafe({id: styleId})
-        .then(([style]) => style)
-        .then(configDialog);
+      getStylesSafe({id: styleId}).then(([style]) => {
+        hotkeys.disable();
+        configDialog(style).then(() => {
+          hotkeys.enable();
+        });
+      });
     }
   },