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 219 matching lines @@
     }
 
     element.setAttribute("aria-label", title);
     if (this.details[i].searchable)
       element.setAttribute("data-search", title.toLowerCase());
     let controls = element.querySelectorAll(".control[role='checkbox']");
     for (let control of controls)
     {
       control.setAttribute("aria-checked", item.disabled == false);
       if (isAcceptableAds(item.url) && this == collections.filterLists)
+      {
         control.disabled = true;
+      }
     }
+    getPref("additional_subscriptions", (additionalSubscriptions) =>

[Thomas Greiner, 2018/03/07 17:45:38]

I just noticed that this is called each time we update an item in a collection.
So instead of requesting this preference each time an item is updated, let's
intead request it once on page load as we do with `acceptableAdsUrl` and other
preferences.

[saroyanm, 2018/03/08 18:03:36]

Done, we still need to refactor code to avoid the callback hells, there is an
implementation in Patchset #7 which fixes that by using promises, but as we
discussed, we would like to fix that separately, in order to introduce as few
code as possible in current review. I think we can refactor the callback hell as
part of -> https://issues.adblockplus.org/ticket/5747

[Thomas Greiner, 2018/03/08 19:28:19]

I agree that this can be tackled separately as part of #5747.

+    {
+      if (additionalSubscriptions.includes(item.url))
+      {
+        element.classList.add("preconfigured");
+        if (this == collections.protection)

[Thomas Greiner, 2018/03/07 17:45:38]

We tend to avoid hard-coding behavior for specific lists in `Collection` so
here's one way to avoid that:

let affectedElements =
element.querySelectorAll("[data-disable~='preconfigured']");
for (let affectedElement of affectedElements)
{
  affectedElement.disabled = true;
}

We could even reuse that approach for the code above, for example, by handling
`[data-disable~="acceptable-ads"]` to avoid hardcoding the list there. But that
may be out of scope for this issue so just wanted to mention it.

[saroyanm, 2018/03/08 18:03:36]

Done.

+          controls[0].disabled = true;
+      }
+    });
 
     let lastUpdateElement = element.querySelector(".last-update");
     if (lastUpdateElement)
     {
       let message = element.querySelector(".message");
       if (item.isDownloading)
       {
         let text = getMessage("options_filterList_lastDownload_inProgress");
         message.textContent = text;
         element.classList.add("show-message");
@@ skipping 1213 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);