Issue 6499

lib/options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module options */
 
 "use strict";
 
 const {getDecodedHostname} = require("url");
 const {checkWhitelisted} = require("whitelisting");
-const {port} = require("messaging");
 const info = require("info");
 
 const optionsUrl = "options.html";
 
 function findOptionsTab(callback)
 {
   browser.tabs.query({}, tabs =>
   {
     // We find a tab ourselves because Edge has a bug when quering tabs with
     // extension URL protocol:
@@ skipping 65 matching lines @@
   else
   {
     // If we don't already have an options page, it means we've just opened
     // one, in which case we must find the tab, wait for it to be ready, and
     // then return the call.
     findOptionsTab(tab =>
     {
       if (!tab)
         return;
 
-      function onMessage(message, sender)
+      function onMessage(message, port)
       {
-        if (message.type == "app.listen" &&
-            sender.page && sender.page.id == tab.id)
-        {
-          port.off("app.listen", onMessage);
-          callback(new ext.Page(tab));
-        }
+        if (message.type != "app.listen")
+          return;
+
+        port.onMessage.removeListener(onMessage);
+        callback(new ext.Page(tab));
       }
 
-      port.on("app.listen", onMessage);
+      function onConnect(port)
+      {
+        let {name, sender} = port;
+        if (name != "ui" || !sender || sender.tab.id != tab.id)
+          return;
+
+        browser.runtime.onConnect.removeListener(onConnect);
+        port.onMessage.addListener(onMessage);
+      }
+
+      browser.runtime.onConnect.addListener(onConnect);
     });
   }
 }
 
 let showOptions =
 /**
  * Opens the options page.
  *
  * @param {function} callback
  */
@@ skipping 77 matching lines @@
         args: [
           {
             host: getDecodedHostname(currentPage.url).replace(/^www\./, ""),
             whitelisted: !!checkWhitelisted(currentPage)
           }
         ]
       });
     });
   });
 });