[Pkg-mozext-commits] [adblock-plus] 56/87: Issue 3862 - Make antiadblockInit use the new FilterNotifier API

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 387d78887931f1ab2f649db41343eedfc7ece898
Author: Sebastian Noack <sebastian at adblockplus.org>
Date:   Wed Mar 23 13:25:33 2016 +0100

    Issue 3862 - Make antiadblockInit use the new FilterNotifier API
---
 lib/antiadblockInit.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/antiadblockInit.js b/lib/antiadblockInit.js
index 79f3fb9..73a0718 100644
--- a/lib/antiadblockInit.js
+++ b/lib/antiadblockInit.js
@@ -72,14 +72,19 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification()
   if (subscription.lastDownload && subscription.disabled)
     addAntiAdblockNotification(subscription);
 
-  FilterNotifier.addListener(function(action, value, newItem, oldItem)
+  function onSubscriptionChange(subscription)
   {
-    if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl)
+    let url = Prefs.subscriptions_antiadblockurl;
+    if (url != subscription.url)
       return;
 
-    if (action == "subscription.updated")
-      addAntiAdblockNotification(value);
-    else if (action == "subscription.removed" || (action == "subscription.disabled" && !value.disabled))
+    if (url in FilterStorage.knownSubscriptions && !subscription.disabled)
+      addAntiAdblockNotification(subscription);
+    else
       removeAntiAdblockNotification();
-  });
+  }
+
+  FilterNotifier.on("subscription.updated", onSubscriptionChange);
+  FilterNotifier.on("subscription.removed", onSubscriptionChange);
+  FilterNotifier.on("subscription.disabled", onSubscriptionChange);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git