Issue 3971 - Refactor away Object.observe

new-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 368 matching lines @@
   ]);
   collections.filterLists = new Collection(
   [
     {
       id: "all-filter-lists-table",
       onClick: toggleDisableSubscription,
       useOriginalTitle: true
     }
   ]);
 
-  function observeSubscription(subscription)
+  function updateLanguageCollections(subscription)
   {
-    function onObjectChanged(change)
+    var recommendation = recommendationsMap[subscription.url];
+
+    if (recommendation && recommendation.type == "ads")
     {
-      for (var i = 0; i < change.length; i++)
+      if (subscription.disabled)
       {
-        if (change[i].name == "disabled")
-        {
-          var recommendation = recommendationsMap[subscription.url];
-          if (recommendation && recommendation.type == "ads")
-          {
-            if (subscription.disabled == false)
-            {
-              collections.allLangs.removeItem(subscription);
-              collections.langs.addItems(subscription);
-            }
-            else
-            {
-              collections.allLangs.addItems(subscription);
-              collections.langs.removeItem(subscription);
-            }
-          }
-        }
+        collections.allLangs.addItems(subscription);
+        collections.langs.removeItem(subscription);
       }
+      else
+      {
+        collections.allLangs.removeItem(subscription);
+        collections.langs.addItems(subscription);
+      }
+    }
+  }
 
-      for (var name in collections)
-        collections[name].updateItem(subscription);
+  function addSubscription(subscription)
+  {
+    var collection;
+    if (subscription.url in recommendationsMap)
+    {
+      var recommendation = recommendationsMap[subscription.url];
+      if (recommendation.type != "ads")
+        collection = collections.popular;
+      else if (subscription.disabled == false)
+        collection = collections.langs;
+      else
+        collection = collections.allLangs;
     }
+    else if (subscription.url == acceptableAdsUrl)
+      collection = collections.acceptableAds;
+    else
+      collection = collections.custom;
 
-    if (!Object.observe)
-    {
-      Object.keys(subscription).forEach(function(property)
-      {
-        var value = subscription[property];
-        Object.defineProperty(subscription, property,
-        {
-          get: function()
-          {
-            return value;
-          },
-          set: function(newValue)
-          {
-            if (value != newValue)
-            {
-              value = newValue;
-              onObjectChanged([{name: property}]);
-            }
-          }
-        });
-      });
-    }
-    else
-    {
-      Object.observe(subscription, onObjectChanged);
-    }
+    collection.addItems(subscription);
+    subscriptionsMap[subscription.url] = subscription;
   }
 
   function updateSubscription(subscription)
   {
-    var subscriptionUrl = subscription.url;
-    var knownSubscription = subscriptionsMap[subscriptionUrl];
-    if (knownSubscription)
+    var knownSubscription = subscriptionsMap[subscription.url];
+    for (var property in subscription)
     {
-      for (var property in subscription)
-      {
-        if (property == "title" && subscriptionUrl in recommendationsMap)
-          knownSubscription.originalTitle = subscription.title;
-        else
-          knownSubscription[property] = subscription[property];
-      }
+      if (property == "title" && subscription.url in recommendationsMap)
+        knownSubscription.originalTitle = subscription.title;
+      else
+        knownSubscription[property] = subscription[property];
     }
-    else
-    {
-      observeSubscription(subscription);
 
-      var collection;
-      if (subscriptionUrl in recommendationsMap)
-      {
-        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;
-      else
-        collection = collections.custom;
+    for (var name in collections)
+      collections[name].updateItem(knownSubscription);
 
-      collection.addItems(subscription);
-      subscriptionsMap[subscriptionUrl] = subscription;
-    }
+    return knownSubscription;
   }
 
   function updateFilter(filter)
   {
     var match = filter.text.match(/^@@\|\|([^\/:]+)\^\$document$/);
     if (match && !filtersMap[filter.text])
     {
       filter.title = match[1];
       collections.whitelist.addItems(filter);
     }
@@ skipping 32 matching lines @@
             prefix = prefix.replace(/\W/g, "_");
             subscription.title = getMessage("options_language_" + prefix);
           }
           else
           {
             var type = recommendation.type.replace(/\W/g, "_");
             subscription.title = getMessage("common_feature_" + type + "_title");
           }
 
           recommendationsMap[subscription.url] = recommendation;
-          updateSubscription(subscription);
+          addSubscription(subscription);
         }
       });
   }
 
   function findParentData(element, dataName, returnElement)
   {
     while (element)
     {
       if (element.hasAttribute("data-" + dataName))
         return returnElement ? element : element.getAttribute("data-" + dataName);
@@ skipping 322 matching lines @@
     });
     loadRecommendations();
     ext.backgroundPage.sendMessage(
     {
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
     function(url)
     {
       acceptableAdsUrl = url;
-      updateSubscription({
+      addSubscription({
         url: acceptableAdsUrl,
         disabled: true
       });
 
       // Load user subscriptions
       ext.backgroundPage.sendMessage(
       {
         type: "subscriptions.get",
         downloadable: true
       },
@@ skipping 69 matching lines @@
         delete filtersMap[filter.text];
         updateShareLink();
         break;
     }
   }
 
   function onSubscriptionMessage(action, subscription)
   {
     switch (action)
     {
+      case "disabled":
+        subscription = updateSubscription(subscription);
+        updateLanguageCollections(subscription);
+        break;
+      case "downloading":
+      case "downloadStatus":
+      case "homepage":
+      case "lastDownload":
+      case "title":
+        updateSubscription(subscription);
+        break;
       case "added":
-        updateSubscription(subscription);
-        updateShareLink();
+        if (subscription.url in subscriptionsMap)
+          subscription = updateSubscription(subscription);
+        else
+          addSubscription(subscription);
 
-        var knownSubscription = subscriptionsMap[subscription.url];
-        if (knownSubscription)
-          collections.filterLists.addItems(knownSubscription);
-        else
-          collections.filterLists.addItems(subscription);
-        break;
-      case "disabled":
-        updateSubscription(subscription);
-        updateShareLink();
+        collections.filterLists.addItems(subscription);
+        updateLanguageCollections(subscription);
         break;
       case "removed":
         var knownSubscription = subscriptionsMap[subscription.url];
-        if (subscription.url == acceptableAdsUrl)
+
+        if (subscription.url == acceptableAdsUrl ||
+            subscription.url in recommendationsMap)
         {
           subscription.disabled = true;
-          updateSubscription(subscription);
+          onSubscriptionMessage("disabled", subscription);
         }
         else
         {
-          if (subscription.url in recommendationsMap)
-            knownSubscription.disabled = true;
-          else
-          {
-            collections.custom.removeItem(knownSubscription);
-            delete subscriptionsMap[subscription.url];
-          }
+          collections.custom.removeItem(knownSubscription);
+          delete subscriptionsMap[subscription.url];
         }
-        updateShareLink();
         collections.filterLists.removeItem(knownSubscription);
         break;
-      default:
-        updateSubscription(subscription);
-        break;
     }
+
+    updateShareLink();
   }
 
   function hidePref(key, value)
   {
     var element = document.querySelector("[data-pref='" + key + "']");
     if (element)
       element.setAttribute("aria-hidden", value);
   }
 
   function getPref(key, callback)
@@ skipping 138 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();