Issue 5315 - Add support for Microsoft Edge

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 51 matching lines @@
                                  "downloadable", "special");
 const removeSubscription = wrapper({type: "subscriptions.remove"}, "url");
 const addSubscription = wrapper({type: "subscriptions.add"},
                                 "url", "title", "homepage");
 const toggleSubscription = wrapper({type: "subscriptions.toggle"},
                                    "url", "keepInstalled");
 const updateSubscription = wrapper({type: "subscriptions.update"}, "url");
 const importRawFilters = wrapper({type: "filters.importRaw"},
                                  "text", "removeExisting");
 const addFilter = wrapper({type: "filters.add"}, "text");
-const getFilters = wrapper({type: "filters.get"}, "subscriptionUrl");
 const removeFilter = wrapper({type: "filters.remove"}, "text");
-const escapeCSS = wrapper({type: "utils.escapeCSS"}, "CSS");
+const quoteCSS = wrapper({type: "composer.quoteCSS"}, "CSS");
 
 const whitelistedDomainRegexp = /^@@\|\|([^/:]+)\^\$document$/;
 const statusMessages = new Map([
    ["synchronize_invalid_url",
     "filters_subscription_lastDownload_invalidURL"],
    ["synchronize_connection_error",
     "filters_subscription_lastDownload_connectionError"],
    ["synchronize_invalid_data",
     "filters_subscription_lastDownload_invalidData"],
    ["synchronize_checksum_mismatch",
@@ skipping 96 matching lines @@
   // Load recommended subscriptions
   loadRecommendations();
 
   // Show user's filters
   reloadFilters();
 }
 $(loadOptions);
 
 function convertSpecialSubscription(subscription)
 {
-  getFilters(subscription.url, filters =>
-  {
-    for (let filter of filters)
-    {
-      if (whitelistedDomainRegexp.test(filter.text))
-        appendToListBox("excludedDomainsBox", RegExp.$1);
-      else
-        appendToListBox("userFiltersBox", filter.text);
-    }
-  });
+  for (let filter of subscription.filters)
+  {
+    if (whitelistedDomainRegexp.test(filter.text))
+      appendToListBox("excludedDomainsBox", RegExp.$1);
+    else
+      appendToListBox("userFiltersBox", filter.text);
+  }
 }
 
 // Reloads the displayed subscriptions and filters
 function reloadFilters()
 {
   // Load user filter URLs
   let container = document.getElementById("filterLists");
   while (container.lastChild)
     container.removeChild(container.lastChild);
 
@@ skipping 318 matching lines @@
   elt.value = text;
   document.getElementById(boxId).appendChild(elt);
 }
 
 // Remove a filter string from a list box.
 function removeFromListBox(boxId, text)
 {
   let list = document.getElementById(boxId);
   // Edge does not support CSS.escape yet:
   // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/101410/
-  escapeCSS(text, escapedCSS =>
+  quoteCSS(text, escapedCSS =>
   {
     let selector = "option[value=" + escapedCSS + "]";
     for (let option of list.querySelectorAll(selector))
       list.removeChild(option);
   });
 }
 
 function addWhitelistDomain(event)
 {
   event.preventDefault();
@@ skipping 189 matching lines @@
       onFilterMessage(message.action, message.args[0]);
       break;
     case "prefs.respond":
       onPrefMessage(message.action, message.args[0]);
       break;
     case "subscriptions.respond":
       onSubscriptionMessage(message.action, message.args[0]);
       break;
   }
 });