Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats

popup.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/>.
  */
 
 "use strict";
-
-const {require} = ext.backgroundPage.getWindow();
 
 let tab = null;
 
 function getPref(key, callback)
 {
   chrome.runtime.sendMessage({type: "prefs.get", key}, callback);
 }
 
 function togglePref(key, callback)
 {
   chrome.runtime.sendMessage({type: "prefs.toggle", key}, callback);
 }
 
 function isPageWhitelisted(callback)
 {
   chrome.runtime.sendMessage({type: "filters.isWhitelisted", tab}, callback);
 }
 
 function whenPageReady()
 {
-  let pageId = tab.id;
-
   return new Promise(resolve =>
   {
-    let handlePageReady = () =>
-    {
-      ext.onMessage.removeListener(onMessage);
-      resolve();
-    };
-
-    let onMessage = (message, sender) =>
+    function onMessage(message, sender)
     {
       if (message.type == "composer.ready" && sender.page &&
-          sender.page.id == pageId)
+          sender.page.id == tab.id)
       {
-        handlePageReady();
+        ext.onMessage.removeListener(onMessage);
+        resolve();
       }
-    };
+    }
 
     ext.onMessage.addListener(onMessage);
 
-    chrome.runtime.sendMessage({type: "composer.isPageReady", pageId}, ready =>
+    chrome.runtime.sendMessage({
+      type: "composer.isPageReady",
+      pageId: tab.id
+    },
+    ready =>
     {
       if (ready)
-        handlePageReady();
+      {
+        ext.onMessage.removeListener(onMessage);
+        resolve();
+      }
     });
   });
 }
 
 function onLoad()
 {
   chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
   {
-    tab = tabs[0] && {id: tabs[0].id, url: tabs[0].url};
+    if (tabs.length > 0)
+      tab = {id: tabs[0].id, url: tabs[0].url};
 
-    let url = tab && tab.url && new URL(tab.url);
+    let urlProtocol = tab && tab.url && new URL(tab.url).protocol;
 
     // Mark page as 'local' to hide non-relevant elements
-    if (!url || (url.protocol != "http:" && url.protocol != "https:"))
+    if (urlProtocol != "http:" && urlProtocol != "https:")
     {
       document.body.classList.add("local");
       document.body.classList.remove("nohtml");
     }
     else
     {
       whenPageReady().then(() =>
       {
         document.body.classList.remove("nohtml");
       });
@@ skipping 85 matching lines @@
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   let collapsible = document.getElementById(collapser.dataset.collapsible);
   collapsible.classList.toggle("collapsed");
   togglePref(collapser.dataset.option);
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);