Noissue - Make the options page respond to subscription title and homepage changes

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 426 matching lines @@
       Object.observe(subscription, onObjectChanged);
     }
   }
 
   function updateSubscription(subscription)
   {
     var subscriptionUrl = subscription.url;
     var knownSubscription = subscriptionsMap[subscriptionUrl];
     if (knownSubscription)
     {
       for (var property in subscription)

[Thomas Greiner, 2016/04/06 13:51:18]

Detail: I know that this is valid JavaScript and I'm aware that we don't have
anything in that regard in the coding styles but it's a bit strange seeing this
Python-looking block in JavaScript because usually you would put braces around
blocks that include multiple lines.

It might be comparable to putting multiple statements into a single line (e.g.
`foo(), bar();`) which we would usually avoid even though it is valid JavaScript
and our coding style allows it.

[Sebastian Noack, 2016/04/06 17:26:29]

Done.

-        if (property == "title" && subscription.url in recommendationsMap)

[Thomas Greiner, 2016/04/06 13:51:18]

Detail: I noticed that there's a variable `subscriptionsUrl` above. Feel free to
decide whether you want to reuse (and rename) or remove it.

[Sebastian Noack, 2016/04/06 17:26:29]

Done.

+      {
+        if (property == "title" && subscriptionUrl in recommendationsMap)
           knownSubscription.originalTitle = subscription.title;
         else
           knownSubscription[property] = subscription[property];
+      }
     }
     else
     {
       observeSubscription(subscription);
       getAcceptableAdsURL(function(acceptableAdsUrl)
       {
         var collection = null;
         if (subscriptionUrl in recommendationsMap)
         {
           var recommendation = recommendationsMap[subscriptionUrl];
@@ skipping 445 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:26:30]

Please ignore this change. It's not part of the 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 230 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();