Issue 6009 - Convert URLs into domains when adding domain to whitelist

desktop-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
@@ skipping 900 matching lines @@
 
     // General tab
     getDocLink("contribute", (link) =>
     {
       E("contribute").href = link;
     });
     getDocLink("acceptable_ads_criteria", (link) =>
     {
       setLinks("enable-acceptable-ads-description", link);
     });
-    setElementText(E("tracking-warning-1"), "options_tracking_warning_1", 
+    setElementText(E("tracking-warning-1"), "options_tracking_warning_1",

[saroyanm, 2018/02/14 16:31:06]

Detail: Please do not forget to rebase before pushing the change.

       [getMessage("common_feature_privacy_title"),
-      getMessage("options_acceptableAds_ads_label")]);
-    setElementText(E("tracking-warning-3"), "options_tracking_warning_3", 
+       getMessage("options_acceptableAds_ads_label")]);
+    setElementText(E("tracking-warning-3"), "options_tracking_warning_3",
       [getMessage("options_acceptableAds_privacy_label")]);
 
     getDocLink("privacy_friendly_ads", (link) =>
     {
       E("enable-acceptable-ads-privacy-description").href = link;
     });
     getDocLink("adblock_plus_{browser}_dnt", url =>
     {
       setLinks("dnt", url);
     });
@@ skipping 269 matching lines @@
     for (let whitelistItem of collections.whitelist.items)
     {
       if (whitelistItem.title == domain.value)
       {
         whitelistItem[timestampUI] = Date.now();
         collections.whitelist.updateItem(whitelistItem);
         domain.value = "";
         break;
       }
     }
-    if (domain.value)
+    const value = domain.value.trim();
+    if (value)
     {
+      const host = /^https?:\/\//i.test(value) ? new URL(value).host : value;
       sendMessageHandleErrors({
         type: "filters.add",
-        text: "@@||" + domain.value.toLowerCase() + "^$document"
+        text: "@@||" + host.toLowerCase() + "^$document"
       });
     }
 
     domain.value = "";
     E("whitelisting-add-button").disabled = true;
   }
 
   function addEnableSubscription(url, title, homepage)
   {
     let messageType = null;
@@ skipping 240 matching lines @@
   });
   browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }