Issue 1801 - Use URL objects to process URLs in the background page

popup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 var backgroundPage = ext.backgroundPage.getWindow();
-var imports = ["require", "extractHostFromURL"];
-for (var i = 0; i < imports.length; i++)
-  window[imports[i]] = backgroundPage[imports[i]];
+var require = backgroundPage.require;
 
 var Filter = require("filterClasses").Filter;
 var FilterStorage = require("filterStorage").FilterStorage;
 var Prefs = require("prefs").Prefs;
-var isWhitelisted = require("whitelisting").isWhitelisted;
+var isPageWhitelisted = require("whitelisting").isPageWhitelisted;
+var getDecodedHostname = require("url").getDecodedHostname;
 
 var page = null;
 
 function init()
 {
   ext.pages.query({active: true, lastFocusedWindow: true}, function(pages)
   {
     page = pages[0];
 
     // Mark page as 'local' or 'nohtml' to hide non-relevant elements
-    if (!page || !/^https?:\/\//.test(page.url))
+    if (!page || (page.url.protocol != "http:" &&
+                  page.url.protocol != "https:"))
       document.body.classList.add("local");
     else if (!backgroundPage.htmlPages.has(page))
       document.body.classList.add("nohtml");
 
     // Ask content script whether clickhide is active. If so, show cancel button.
     // If that isn't the case, ask background.html whether it has cached filters. If so,
     // ask the user whether she wants those filters.
     // Otherwise, we are in default state.
     if (page)
     {
-      if (isWhitelisted(page.url))
+      if (isPageWhitelisted(page))
         document.getElementById("enabled").classList.add("off");
 
       page.sendMessage({type: "get-clickhide-state"}, function(response)
       {
         if (response && response.active)
           document.body.classList.add("clickhide-active");
       });
     }
   });
 
@@ skipping 17 matching lines @@
   }
 }
 window.addEventListener("DOMContentLoaded", init, false);
 
 function toggleEnabled()
 {
   var enabledButton = document.getElementById("enabled")
   var disabled = enabledButton.classList.toggle("off");
   if (disabled)
   {
-    var host = extractHostFromURL(page.url).replace(/^www\./, "");
+    var host = getDecodedHostname(page.url).replace(/^www\./, "");
     var filter = Filter.fromText("@@||" + host + "^$document");
     if (filter.subscriptions.length && filter.disabled)
       filter.disabled = false;
     else
     {
       filter.disabled = false;
       FilterStorage.addFilter(filter);
     }
   }
   else
   {
     // Remove any exception rules applying to this URL
-    var filter = isWhitelisted(page.url);
+    var filter = isPageWhitelisted(page);
     while (filter)
     {
       FilterStorage.removeFilter(filter);
       if (filter.subscriptions.length)
         filter.disabled = true;
-      filter = isWhitelisted(page.url);
+      filter = isPageWhitelisted(page);
     }
   }
 }
 
 function activateClickHide()
 {
   document.body.classList.add("clickhide-active");
   page.sendMessage({type: "clickhide-activate"});
 
   // Close the popup after a few seconds, so user doesn't have to
@@ skipping 10 matching lines @@
   document.body.classList.remove("clickhide-active");
   page.sendMessage({type: "clickhide-deactivate"});
 }
 
 function toggleCollapse(event)
 {
   var collapser = event.currentTarget;
   Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
   collapser.parentNode.classList.toggle("collapsed");
 }