Issue 6432 - Hide remove button for additional filter lists

js/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 932 matching lines @@
   });
 
   // Advanced tab
   let customize = document.querySelectorAll("#customize li[data-pref]");
   customize = Array.prototype.map.call(customize, (checkbox) =>
   {
     return checkbox.getAttribute("data-pref");
   });
   for (let key of customize)
   {
-    getHidePref(key, (value) =>
+    getPref(key, (value) =>
     {
       onPrefMessage(key, value, true);
     });
   }
   browser.runtime.sendMessage({
     type: "app.get",
     what: "features"
   },
   (features) =>
   {
@@ skipping 159 matching lines @@
   }
   return acceptableAdsList && acceptableAdsList.disabled == false &&
     privacyList && privacyList.disabled == false;
 }
 
 function setPrivacyConflict()
 {
   let acceptableAdsForm = E("acceptable-ads");
   if (hasPrivacyConflict())
   {
-    getHidePref("ui_warn_tracking", (showTrackingWarning) =>
+    getPref("ui_warn_tracking", (showTrackingWarning) =>
     {
       acceptableAdsForm.classList.toggle("show-warning", showTrackingWarning);
     });
   }
   else
   {
     acceptableAdsForm.classList.remove("show-warning");
   }
 }
 
@@ skipping 14 matching lines @@
   (subscriptions) =>
   {
     let customFilterPromises = subscriptions.map(getSubscriptionFilters);
     Promise.all(customFilterPromises).then((filters) =>
     {
       loadCustomFilters([].concat(...filters));
       isCustomFiltersLoaded = true;
     });
   });
   loadRecommendations();
-  let preloadPrefs = ["subscriptions_exceptionsurl",
-                      "subscriptions_exceptionsurl_privacy",
-                      "additional_subscriptions"];
-  getPrefs(preloadPrefs).then(prefs =>
-  {
-    [acceptableAdsUrl, acceptableAdsPrivacyUrl,
-      additionalSubscriptions] = prefs;
-
-    return browser.runtime.sendMessage({
-      type: "subscriptions.get",
-      downloadable: true
+  browser.runtime.sendMessage({
+    type: "prefs.get",
+    key: "subscriptions_exceptionsurl"
+  },
+  (url) =>
+  {
+    acceptableAdsUrl = url;
+
+    browser.runtime.sendMessage({
+      type: "prefs.get",
+      key: "subscriptions_exceptionsurl_privacy"
+    },
+    (urlPrivacy) =>
+    {
+      acceptableAdsPrivacyUrl = urlPrivacy;
+
+      getPref("additional_subscriptions", (subscriptionUrls) =>
+      {
+        additionalSubscriptions = subscriptionUrls;
+
+        // Load user subscriptions
+        browser.runtime.sendMessage({
+          type: "subscriptions.get",
+          downloadable: true
+        },
+        (subscriptions) =>
+        {
+          for (let subscription of subscriptions)
+            onSubscriptionMessage("added", subscription);
+
+          setAcceptableAds();
+        });
+      });
     });
-  }).then((subscriptions) =>
-  {
-    for (let subscription of subscriptions)
-      onSubscriptionMessage("added", subscription);
-
-    setAcceptableAds();
   });
 }
 
 function addWhitelistedDomain()
 {
   let domain = E("whitelisting-textbox");
   for (let whitelistItem of collections.whitelist.items)
   {
     if (whitelistItem.title == domain.value)
     {
@@ skipping 139 matching lines @@
     subscriptionUrl: subscription.url});
 }
 
 function hidePref(key, value)
 {
   let element = document.querySelector("[data-pref='" + key + "']");
   if (element)
     element.setAttribute("aria-hidden", value);
 }
 
-function getPrefs(prefKeys)
-{
-  prefKeys = prefKeys.map(key => browser.runtime.sendMessage({
-    type: "prefs.get", key
-  }));
-  return Promise.all(prefKeys);
-}
-
-function getHidePref(key, callback)
-{
-  let checkPref = getHidePref.checks[key] || getHidePref.checkNone;
+function getPref(key, callback)
+{
+  let checkPref = getPref.checks[key] || getPref.checkNone;
   checkPref((isActive) =>
   {
     if (!isActive)
     {
       hidePref(key, !isActive);
       return;
     }
 
     browser.runtime.sendMessage({
       type: "prefs.get",
       key
     }, callback);
   });
 }
 
-getHidePref.checkNone = function(callback)
+getPref.checkNone = function(callback)
 {
   callback(true);
 };
 
-getHidePref.checks =
+getPref.checks =
 {
   notifications_ignoredcategories(callback)
   {
-    getHidePref("notifications_showui", callback);
+    getPref("notifications_showui", callback);
   }
 };
 
 function onPrefMessage(key, value, initial)
 {
   switch (key)
   {
     case "notifications_ignoredcategories":
       value = value.indexOf("*") == -1;
       break;
@@ skipping 82 matching lines @@
            "ui_warn_tracking"]
 });
 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);