[Pkg-mozext-commits] [adblock-plus] 22/98: Issue 4230 - Don't disable element hiding if a generichide exception rule is present

[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 4f9be5ff55aada19050bbf0d9d2017318ed6b440
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Jul 6 15:56:34 2016 +0200

    Issue 4230 - Don't disable element hiding if a generichide exception rule is present
---
 lib/elemHideFF.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/elemHideFF.js b/lib/elemHideFF.js
index fc8da1f..0b4a396 100644
--- a/lib/elemHideFF.js
+++ b/lib/elemHideFF.js
@@ -50,14 +50,17 @@ port.on("elemhideEnabled", ({frames, isPrivate}) =>
   if (hit)
   {
     let [frameIndex, contentType, docDomain, thirdParty, location, filter] = hit;
-    if (!isPrivate)
-      FilterStorage.increaseHitCount(filter);
-    return {
-      enabled: false,
-      contentType, docDomain, thirdParty, location,
-      filter: filter.text, filterType: filter.type
-    };
+    if (contentType != "GENERICHIDE")
+    {
+      if (!isPrivate)
+        FilterStorage.increaseHitCount(filter);
+      return {
+        enabled: false,
+        contentType, docDomain, thirdParty, location,
+        filter: filter.text, filterType: filter.type
+      };
+    }
   }
-  else
-    return {enabled: true};
+
+  return {enabled: true};
 });

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