Extension shouldn't be enabled in pb mode as it's currently not working in many places. Fixes #756

2017-08-23 15:23:49 +01:00
parent 29f078d2c9
commit 70573d0559
3 changed files with 29 additions and 18 deletions
@@ -109,20 +109,7 @@ const messageHandler = {
    });

    browser.windows.onFocusChanged.addListener((windowId) => {
-      assignManager.removeContextMenu();
-      // browserAction loses background color in new windows ...
-      // https://bugzil.la/1314674
-      // https://github.com/mozilla/testpilot-containers/issues/608
-      // ... so re-call displayBrowserActionBadge on window changes
-      badge.displayBrowserActionBadge();
-      browser.tabs.query({active: true, windowId}).then((tabs) => {
-        if (tabs && tabs[0]) {
-          tabPageCounter.initTabCounter(tabs[0]);
-          assignManager.calculateContextMenu(tabs[0]);
-        }
-      }).catch((e) => {
-        throw e;
-      });
+      this.onFocusChangedCallback(windowId);
    });

    browser.idle.onStateChanged.addListener((newState) => {
@@ -161,6 +148,24 @@ const messageHandler = {
      }, this.LAST_CREATED_TAB_TIMER);
    });

+  },
+
+  async onFocusChangedCallback(windowId) {
+    assignManager.removeContextMenu();
+    const currentWindow = await browser.windows.getCurrent();
+    // browserAction loses background color in new windows ...
+    // https://bugzil.la/1314674
+    // https://github.com/mozilla/testpilot-containers/issues/608
+    // ... so re-call displayBrowserActionBadge on window changes
+    badge.displayBrowserActionBadge(currentWindow.incognito);
+    browser.tabs.query({active: true, windowId}).then((tabs) => {
+      if (tabs && tabs[0]) {
+        tabPageCounter.initTabCounter(tabs[0]);
+        assignManager.calculateContextMenu(tabs[0]);
+      }
+    }).catch((e) => {
+      throw e;
+    });
  }
 };