Unified Diff: lib/filterClasses.js
Issue 5840485868371968:
Issue 616 - Add $generichide + $genericblock filter options and enforce them. (Closed)
Patch Set: Rebased onto typeMask changes
Created July 14, 2015, 4:41 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/contentPolicy.js ('K')
|
« lib/contentPolicy.js ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/filterClasses.js |
| diff --git a/lib/filterClasses.js b/lib/filterClasses.js |
| index 1932a6895b6b4d15897d2a104d416be74e2bd80a..bd86d9346f50b733df532f09235e85fb0d57f346 100644 |
| --- a/lib/filterClasses.js |
| +++ b/lib/filterClasses.js |
| @@ -754,11 +754,17 @@ RegExpFilter.typeMap = { |
| BACKGROUND: 4, // Backwards compat, same as IMAGE |
| POPUP: 0x10000000, |
| - ELEMHIDE: 0x40000000 |
| + GENERICBLOCK: 0x20000000, |
| + ELEMHIDE: 0x40000000, |
| + GENERICHIDE: 0x80000000 |
| }; |
| -// DOCUMENT, ELEMHIDE, POPUP options shouldn't be there by default |
| -RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP); |
| +// DOCUMENT, ELEMHIDE, POPUP, GENERICHIDE and GENERICBLOCK options shouldn't be there by default |
| +RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.DOCUMENT | |
| + RegExpFilter.typeMap.ELEMHIDE | |
| + RegExpFilter.typeMap.POPUP | |
| + RegExpFilter.typeMap.GENERICHIDE | |
| + RegExpFilter.typeMap.GENERICBLOCK); |
| /** |
| * Class for blocking filters |
« lib/contentPolicy.js ('K')
|
« lib/contentPolicy.js ('k')
|
no next file »
|
no next file with comments »
