From 528c8ea57790738564cf42b6fb499bdfd7f2e78a Mon Sep 17 00:00:00 2001
From: hackademix
Date: Wed, 11 Dec 2019 13:02:10 +0100
Subject: Fixed shortcut and context menu doing nothing unless browserAction
 icon is visible on Firefox (issue #58).

---
 src/bg/main.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/bg/main.js')

diff --git a/src/bg/main.js b/src/bg/main.js
index 6e2cdf9..fa58b3a 100644
--- a/src/bg/main.js
+++ b/src/bg/main.js
@@ -54,19 +54,23 @@
   };
 
   let Commands = {
-    openPageUI() {
+    async openPageUI() {
+      if (ns.popupOpening) return;
+      ns.popupOpening = true;
+      ns.popupOpened = false;
+      let openPanel = async () => {
+        ns.popupOpening = false;
+        if (ns.popupOpened) return;
+        messageHandler.openStandalonePopup();
+      };
       try {
-        browser.browserAction.openPopup();
+        await browser.browserAction.openPopup();
+        setTimeout(openPanel, 500);
         return;
       } catch (e) {
+        openPanel();
         debug(e);
       }
-      browser.windows.create({
-        url: popupURL,
-        width: 800,
-        height: 600,
-        type: "panel"
-      });
     },
 
     togglePermissions() {},
-- 
cgit v1.2.3