Issue 3885 - Disable the checkbox to toggle the Acceptable Ads list on the options page

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 160 matching lines @@
       var title = null;
       if (this.details[i].useOriginalTitle)
         title = item.originalTitle;
       if (!title)
         title = item.title || item.url || item.text;
       element.querySelector(".display").textContent = title;
       if (title)
         element.setAttribute("data-search", title.toLowerCase());
       var control = element.querySelector(".control[role='checkbox']");
       if (control)
+      {
         control.setAttribute("aria-checked", item.disabled == false);
+        if (item.disableable == false &&
+            this.details[i].onClick == toggleDisableSubscription)
+          control.setAttribute("disabled", true);
+      }
 
       var downloadStatus = item.downloadStatus;
       var dateElement = element.querySelector(".date");
       var timeElement = element.querySelector(".time");
       if(dateElement && timeElement)
       {
         var message = element.querySelector(".message");
         ext.backgroundPage.sendMessage(
         {
           type: "subscriptions.isDownloading",
@@ skipping 254 matching lines @@
         {
           var recommendation = recommendationsMap[subscriptionUrl];
           if (recommendation.type != "ads")
             collection = collections.popular;
           else if (subscription.disabled == false)
             collection = collections.langs;
           else
             collection = collections.allLangs;
         }
         else if (subscriptionUrl == acceptableAdsUrl)
+        {
           collection = collections.acceptableAds;
+          subscription.disableable = false;
+        }
         else
           collection = collections.custom;
 
         collection.addItems(subscription);
         subscriptionsMap[subscriptionUrl] = subscription;
       });
     }
   }
 
   function updateFilter(filter)
@@ skipping 423 matching lines @@
   {
     var customFilterItems = collections.customFilters.items;
     var filterTexts = [];
     for (var i = 0; i < customFilterItems.length; i++)
       filterTexts.push(customFilterItems[i].text);
     E("custom-filters-raw").value = filterTexts.join("\n");
   }
 
   function getAcceptableAdsURL(callback)
   {
-    getPref("subscriptions_exceptionsurl", function(value)
-    {
-      getAcceptableAdsURL = function(callback)
-      {
-        callback(value);
-      };
-      getAcceptableAdsURL(callback);
-    });
+    getPref("subscriptions_exceptionsurl", callback);

[Sebastian Noack, 2016/04/01 15:41:56]

Unrelated, but I couldn't resits. WTF?

[Sebastian Noack, 2016/04/06 17:15:41]

Ahh, now I understand. The old code impelemted some caching by overriding the
global getAcceptableAdsURL() function. However, removing the caching caused some
weird side effect when adding custom subscriptions. But anyway, why don't we
simply put the Acceptable Ads subscription URL in a global variable when
initially populating the options page? I uploaded a new patch doing that. The
code is much simpler now, and seems to work great.

[Thomas Greiner, 2016/04/07 17:21:15]

Yeah, the idea here was to avoid messaging the background page each time when
requesting the filter list URL but the implementation is a bit flawed in that it
doesn't queue up calls that are made between the first message and the first
message response.

Using a global variable instead is perfectly fine with me. Alternatively, we
could've also used Promises for that.

[Sebastian Noack, 2016/04/08 14:22:16]

Well, a promise still requires a callback. Caching it into a global seems to be
the simplest solution.

   }
 
   function addEnableSubscription(url, title, homepage)
   {
     var messageType = null;
     var knownSubscription = subscriptionsMap[url];
     if (knownSubscription && knownSubscription.disabled == true)
       messageType = "subscriptions.toggle"
     else
       messageType = "subscriptions.add"
@@ skipping 231 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();