Issue 4587 - Blockable items list calls reloadDisabledFilters() unnecessarily often

chrome/content/ui/sidebar.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 76 matching lines @@
     for (let attr in defaults)
       if (!wnd.hasAttribute(attr))
         wnd.setAttribute(attr, defaults[attr]);
   }
 
   let {addBrowserLocationListener} = require("appSupport");
   updateContentLocation();
 
   // Initialize matcher for disabled filters
   reloadDisabledFilters();
-  FilterNotifier.addListener(reloadDisabledFilters);
+  FilterNotifier.on("subscription.added", reloadDisabledFilters);
+  FilterNotifier.on("subscription.removed", reloadDisabledFilters);
+  FilterNotifier.on("subscription.disabled", reloadDisabledFilters);
+  FilterNotifier.on("subscription.updated", reloadDisabledFilters);
+  FilterNotifier.on("filter.added", reloadDisabledFilters);
+  FilterNotifier.on("filter.removed", reloadDisabledFilters);
+  FilterNotifier.on("filter.disabled", reloadDisabledFilters);
   Prefs.addListener(onPrefChange);
 
   // Activate flasher
   list.addEventListener("select", onSelectionChange, false);
 
   // Initialize data
   handleLocationChange();
 
   // Install a progress listener to catch location changes
   if (addBrowserLocationListener)
@@ skipping 30 matching lines @@
 {
   if ("filter" in item && item.filter)
     return Filter.fromText(item.filter);
   else
     return null;
 }
 
 // To be called on unload
 function cleanUp() {
   requestNotifier.shutdown();
-  FilterNotifier.removeListener(reloadDisabledFilters);
+  FilterNotifier.off("subscription.added", reloadDisabledFilters);
+  FilterNotifier.off("subscription.removed", reloadDisabledFilters);
+  FilterNotifier.off("subscription.disabled", reloadDisabledFilters);
+  FilterNotifier.off("subscription.updated", reloadDisabledFilters);
+  FilterNotifier.off("filter.added", reloadDisabledFilters);
+  FilterNotifier.off("filter.removed", reloadDisabledFilters);
+  FilterNotifier.off("filter.disabled", reloadDisabledFilters);
   Prefs.removeListener(onPrefChange);
   E("list").view = null;
 
   let {removeBrowserLocationListener} = require("appSupport");
   if (removeBrowserLocationListener)
     removeBrowserLocationListener(mainWin, handleLocationChange);
   mainWin.removeEventListener("unload", mainUnload, false);
 }
 
 /**
@@ skipping 1157 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }