Whitelist directives must override strict blocking #1228

gorhill · Apr 10, 2015

No description provided.

gorhill · Apr 10, 2015

Ok, I see the pull request includes my revert commit to go back to the fork point... I guess I need to do a hard reset instead of a soft one. Need to read more about all this git stuff.

Will fix this and re-submit later.

gorhill added some commits Apr 10, 2015

gorhill Merge pull request #13 from chrisaljoudi/master …
Keeping an official repo branch so I can make pull requests
b45a42f

gorhill whitelist directives must override strict blocking

8d3ce04

gorhill closed this Apr 10, 2015

gorhill deleted the gorhill:chrisaljoudi branch Apr 10, 2015

@@ @@ -199,6 +199,11 @@ var onBeforeRootFrameRequest = function(details) { @@
          var result = '';
+    +    // If the site is whitelisted, disregard strict blocking
+    +    if ( µb.getNetFilteringSwitch(requestURL) === false ) {
+    +        result = 'ua:whitelisted';
+    +    }
+    +
          // Permanently unrestricted?
          if ( result === '' && µb.hnSwitches.evaluateZ('dontBlockDoc', requestHostname) ) {
              result = 'ua:dontBlockDoc true';
@@ @@ -217,7 +222,7 @@ var onBeforeRootFrameRequest = function(details) { @@
          }
          // Filtering
-    -    if ( result === '' && µb.getNetFilteringSwitch(requestURL) ) {
+    +    if ( result === '' ) {
              result = µb.staticNetFilteringEngine.matchString(context);
              // https://github.com/chrisaljoudi/uBlock/issues/1128
              // Do not block if the match begins after the hostname.

chrisaljoudi/uBlock

Whitelist directives must override strict blocking #1228

Labels

Milestone

Assignee

1 participant