Simplify new tab creation in the popup fixing issues. Fixes #781

mozilla · Sep 1, 2017 · df7d7f9 · df7d7f9
1 parent 65be776
commit df7d7f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/webextension/js/background/backgroundLogic.js b/webextension/js/background/backgroundLogic.js
@@ -50,10 +50,6 @@ const backgroundLogic = {
     });
   },
 
-  async openTab(options) {
-    return this.openNewTab(options);
-  },
-
   async openNewTab(options) {
     let url = options.url || undefined;
     const userContextId = ("userContextId" in options) ? options.userContextId : 0;

diff --git a/webextension/js/background/messageHandler.js b/webextension/js/background/messageHandler.js
@@ -17,10 +17,6 @@ const messageHandler = {
       case "createOrUpdateContainer":
         response = backgroundLogic.createOrUpdateContainer(m.message);
         break;
-      case "openTab":
-        // Same as open-tab for index.js
-        response = backgroundLogic.openTab(m.message);
-        break;
       case "neverAsk":
         assignManager._neverAsk(m);
         break;
@@ -83,18 +79,6 @@ const messageHandler = {
       });
     }
 
-    // Handles messages from sdk code
-    const port = browser.runtime.connect();
-    port.onMessage.addListener(m => {
-      switch (m.type) {
-      case "open-tab":
-        backgroundLogic.openTab(m.message);
-        break;
-      default:
-        throw new Error(`Unhandled message type: ${m.message}`);
-      }
-    });
-
     browser.tabs.onActivated.addListener((info) => {
       assignManager.removeContextMenu();
       browser.tabs.get(info.tabId).then((tab) => {

diff --git a/webextension/js/popup.js b/webextension/js/popup.js
@@ -602,12 +602,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
             || e.target.parentNode.matches(".open-newtab")
             || e.type === "keydown") {
           try {
-            await browser.runtime.sendMessage({
-              method: "openTab",
-              message: {
-                userContextId: Logic.userContextId(identity.cookieStoreId),
-                source: "pop-up"
-              }
+            browser.tabs.create({
+              cookieStoreId: identity.cookieStoreId
             });
             window.close();
           } catch (e) {