Issue 3839 - Adapt for Prefs event changes

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 35 matching lines @@
       {
         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)
     {
-      this._eventEmitter.on("", 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);
@@ skipping 57 matching lines @@
   Object.keys(prefs).forEach(function(key)
   {
     Object.defineProperty(modules.prefs.Prefs, key, {
       get: function()
       {
         return prefs[key];
       },
       set: function(value)
       {
         prefs[key] = value;
-
-        var listeners = modules.prefs.Prefs._listeners[key];
-        if (listeners)
-          for (var i = 0; i < listeners.length; i++)
-            listeners[i]();
+        modules.prefs.Prefs.emit(key);
       }
     });
   });
 
   modules.notification = {
     Notification: {
       toggleIgnoreCategory: function(category)
       {
         var categories = prefs.notifications_ignoredcategories;
         var index = categories.indexOf(category);
@@ skipping 341 matching lines @@
 
   if (params.safariContentBlocker)
   {
     global.safari = {
       extension: {
         setContentBlocker: function() {}
       }
     };
   }
 })(this);