[Pkg-mozext-commits] [adblock-plus] 02/28: issue #690 - don't consider 'acceptable ads' and 'anti-adblock' subscriptions when complaining about high subscription count during issue report

[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 8fe025a145e432939245d4ef427e03dce2d0faa9
Author: Manvel Saroyan <manvel at adblockplus.org>
Date:   Wed Jul 30 15:00:25 2014 +0400

    issue #690 - don't consider 'acceptable ads' and 'anti-adblock' subscriptions when complaining about high subscription count during issue report
---
 chrome/content/ui/sendReport.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js
index a79c59c..651de56 100644
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -733,6 +733,14 @@ let subscriptionUpdateDataSource =
   type: null,
   outdated: null,
   needUpdate: null,
+  
+  subscriptionFilter: function(s)
+  {
+    if (s instanceof DownloadableSubscription)
+      return subscriptionsDataSource.subscriptionFilter(s);
+    else
+      return false;
+  },
 
   collectData: function(wnd, windowURI, callback)
   {
@@ -744,7 +752,7 @@ let subscriptionUpdateDataSource =
     this.outdated = [];
     this.needUpdate = [];
 
-    let subscriptions = FilterStorage.subscriptions.filter(issuesDataSource.subscriptionFilter);
+    let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
     for (let i = 0; i < subscriptions.length; i++)
     {
       let lastSuccess = subscriptions[i].lastSuccess;
@@ -884,8 +892,12 @@ let issuesDataSource =
 
   subscriptionFilter: function(s)
   {
-    if (s instanceof DownloadableSubscription)
+    if (s instanceof DownloadableSubscription &&
+        s.url != Prefs.subscriptions_exceptionsurl &&
+        s.url != Prefs.subscriptions_antiadblockurl)
+    {
       return subscriptionsDataSource.subscriptionFilter(s);
+    }
     else
       return false;
   },

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