aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2015-10-05 10:58:24 -0400
committergorhill <rhill@raymondhill.net>2015-10-05 10:58:24 -0400
commit8f4ee3e34d35478bf6040f14620d9e3d79870019 (patch)
tree7e3da34f8622a8cf7e7bcfe0f374e35bae6175d8 /src
parent3a4abc83d520e01791106c81cde70e235fe6d386 (diff)
downloaduBlock-8f4ee3e34d35478bf6040f14620d9e3d79870019.zip
uBlock-8f4ee3e34d35478bf6040f14620d9e3d79870019.tar.gz
uBlock-8f4ee3e34d35478bf6040f14620d9e3d79870019.tar.bz2
support for `genericblock` filter option (<https://issues.adblockplus.org/ticket/647>)
Diffstat (limited to 'src')
-rw-r--r--src/js/static-net-filtering.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index 92cc7af..d593acf 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -1454,7 +1454,10 @@ FilterParser.prototype.parseOptions = function(s) {
this.parseOptParty(false, not);
continue;
}
- if ( opt === 'elemhide' ) {
+ // https://issues.adblockplus.org/ticket/647
+ // `genericblock` concept already supported, just a matter of
+ // adding support for the new keyword.
+ if ( opt === 'elemhide' || opt === 'genericblock' ) {
if ( this.action === AllowAction ) {
this.parseOptType('elemhide', false);
this.action = BlockAction;