[Pkg-mozext-commits] [adblock-plus] 03/28: Issue 1161 - Anti-adblock notifications were triggered on similar domains

[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 03b965c743f7688622b75b0e7525a17913d7e0ea
Author: Thomas Greiner <thomas at adblockplus.org>
Date:   Thu Jul 31 10:18:45 2014 +0200

    Issue 1161 - Anti-adblock notifications were triggered on similar domains
---
 lib/antiadblockInit.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/antiadblockInit.js b/lib/antiadblockInit.js
index d8b29ca..18567d4 100644
--- a/lib/antiadblockInit.js
+++ b/lib/antiadblockInit.js
@@ -46,10 +46,17 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification()
   {
     let urlFilters = [];
     for (let filter of subscription.filters)
+    {
       if (filter instanceof ActiveFilter)
+      {
         for (let domain in filter.domains)
-          if (domain && urlFilters.indexOf(domain) == -1)
-            urlFilters.push(domain);
+        {
+          let urlFilter = "||" + domain + "^";
+          if (domain && filter.domains[domain] && urlFilters.indexOf(urlFilter) == -1)
+            urlFilters.push(urlFilter);
+        }
+      }
+    }
     notification.urlFilters = urlFilters;
     Notification.addNotification(notification);
     Notification.addQuestionListener(notification.id, notificationListener);

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