Issue 3869 - Use the new FilterNotifier API

background.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 32 matching lines @@
     {
       var listeners = this._listeners[name];
       if (listeners)
       {
         for (var i = 0; i < listeners.length; i++)
           listeners[i].apply(null, Array.prototype.slice.call(arguments, 1));
       }
     }
   };
 
-  function Notifier()
-  {
-    this._eventEmitter = new EventEmitter();
-  }
-  Notifier.prototype = {
-    addListener: function(listener)
-    {
-      var listeners = this._eventEmitter._listeners[""];
-      if (!listeners || listener.indexOf(listener) == -1)
-        this._eventEmitter.on("", listener);
-    },
-    removeListener: function(listener)
-    {
-      this._eventEmitter.off("", listener);
-    },
-    triggerListeners: function()
-    {
-      var args = Array.prototype.slice.apply(arguments);
-      args.unshift("");
-      this._eventEmitter.emit.apply(this._eventEmitter, args);
-    }
-  };
-
   function updateFromURL(data)
   {
     if (window.location.search)
     {
       var params = window.location.search.substr(1).split("&");
       for (var i = 0; i < params.length; i++)
       {
         var parts = params[i].split("=", 2);
         if (parts.length == 2 && parts[0] in data)
           data[parts[0]] = decodeURIComponent(parts[1]);
@@ skipping 69 matching lines @@
         modules.prefs.Prefs.notifications_ignoredcategories = categories;
       }
     }
   };
 
   modules.subscriptionClasses = {
     Subscription: function(url)
     {
       this.url = url;
       this.title = "Subscription " + url;
-      this.disabled = false;
+      this._disabled = false;
       this._lastDownload = 1234;
       this.homepage = "https://easylist.adblockplus.org/";
       this.downloadStatus = params.downloadStatus;
     },
 
     SpecialSubscription: function(url)
     {
       this.url = url;
       this.disabled = false;
       this.filters = knownFilters.slice();
     }
   };
   modules.subscriptionClasses.Subscription.fromURL = function(url)
   {
     if (url in knownSubscriptions)
       return knownSubscriptions[url];
 
     if (/^https?:\/\//.test(url))
       return new modules.subscriptionClasses.Subscription(url);
     else
       return new modules.subscriptionClasses.SpecialSubscription(url);
   };
   modules.subscriptionClasses.DownloadableSubscription = modules.subscriptionClasses.Subscription;
 
   modules.subscriptionClasses.Subscription.prototype =
   {
+    get disabled()
+    {
+      return this._disabled;
+    },
+    set disabled(value)
+    {
+      this._disabled = value;
+      modules.filterNotifier.FilterNotifier.emit("subscription.disabled", this);
+    },
     get lastDownload()
     {
       return this._lastDownload;
     },
     set lastDownload(value)
     {
       this._lastDownload = value;
-      modules.filterNotifier.FilterNotifier.triggerListeners("subscription.lastDownload", this);
+      modules.filterNotifier.FilterNotifier.emit("subscription.lastDownload", this);
     }
   };
 
+
   modules.filterStorage = {
     FilterStorage: {
       get subscriptions()
       {
         var subscriptions = [];
         for (var url in modules.filterStorage.FilterStorage.knownSubscriptions)
           subscriptions.push(modules.filterStorage.FilterStorage.knownSubscriptions[url]);
         return subscriptions;
       },
 
       get knownSubscriptions()
       {
         return knownSubscriptions;
       },
 
       addSubscription: function(subscription)
       {
         if (!(subscription.url in modules.filterStorage.FilterStorage.knownSubscriptions))
         {
           knownSubscriptions[subscription.url] = modules.subscriptionClasses.Subscription.fromURL(subscription.url);
-          modules.filterNotifier.FilterNotifier.triggerListeners("subscription.added", subscription);
+          modules.filterNotifier.FilterNotifier.emit("subscription.added", subscription);
         }
       },
 
       removeSubscription: function(subscription)
       {
         if (subscription.url in modules.filterStorage.FilterStorage.knownSubscriptions)
         {
           delete knownSubscriptions[subscription.url];
-          modules.filterNotifier.FilterNotifier.triggerListeners("subscription.removed", subscription);
+          modules.filterNotifier.FilterNotifier.emit("subscription.removed", subscription);
         }
       },
 
       addFilter: function(filter)
       {
         for (var i = 0; i < customSubscription.filters.length; i++)
         {
           if (customSubscription.filters[i].text == filter.text)
             return;
         }
         customSubscription.filters.push(filter);
-        modules.filterNotifier.FilterNotifier.triggerListeners("filter.added", filter);
+        modules.filterNotifier.FilterNotifier.emit("filter.added", filter);
       },
 
       removeFilter: function(filter)
       {
         for (var i = 0; i < customSubscription.filters.length; i++)
         {
           if (customSubscription.filters[i].text == filter.text)
           {
             customSubscription.filters.splice(i, 1);
-            modules.filterNotifier.FilterNotifier.triggerListeners("filter.removed", filter);
+            modules.filterNotifier.FilterNotifier.emit("filter.removed", filter);
             return;
           }
         }
       }
     }
   };
 
   modules.filterClasses = {
     BlockingFilter: function() {},
     Filter: function(text)
@@ skipping 63 matching lines @@
     }
   };
 
   modules.cssRules = {
     CSSRules: {
       getRulesForDomain: function(domain) { }
     }
   };
 
   modules.filterNotifier = {
-    FilterNotifier: new Notifier()
+    FilterNotifier: new EventEmitter()
   };
 
   modules.info = {
     platform: "gecko",
     platformVersion: "34.0",
     application: "firefox",
     applicationVersion: "34.0",
     addonName: "adblockplus",
     addonVersion: "2.6.7"
   };
@@ skipping 143 matching lines @@
 
   if (params.safariContentBlocker)
   {
     global.safari = {
       extension: {
         setContentBlocker: function() {}
       }
     };
   }
 })(this);