Issue 3890 - Fix "Downloading..." indication for subscriptions 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 395 matching lines @@
         }
         for (var i in collections)
           collections[i].updateItem(subscription);
       }
     }
 
     if (!Object.observe)
     {
       Object.keys(subscription).forEach(function(property)
       {
         var value = subscription[property];

[Thomas Greiner, 2016/04/06 14:19:43]

Well spotted.

         Object.defineProperty(subscription, property,
         {
           get: function()
           {
             return value;
           },
           set: function(newValue)
           {
             if (value != newValue)
             {
@@ skipping 477 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", callback);
+    getPref("subscriptions_exceptionsurl", function(value)

[Sebastian Noack, 2016/04/06 17:22:23]

Please ignore this change. It's not part of this patch, but due to rebasing.

+    {
+      getAcceptableAdsURL = function(callback)
+      {
+        callback(value);
+      };
+      getAcceptableAdsURL(callback);
+    });
   }
 
   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 238 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();