Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this fixes #1121: `allow` rule will no longer affect cosmetic filtering. 

the per-site cosmetic filtering switch must be used instead.
This commit is contained in:
gorhill 2015-12-30 17:35:32 -05:00
parent 7952143a1f
commit b63f55b7af
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/pagestore.js
View File

@ -447,23 +447,16 @@ PageStore.prototype.getNetFilteringSwitch = function() {
/******************************************************************************/
PageStore.prototype.getSpecificCosmeticFilteringSwitch = function() {
var tabContext = µb.tabContextManager.mustLookup(this.tabId);
if ( µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) ) {
return false;
}
return µb.userSettings.advancedUserEnabled === false ||
µb.sessionFirewall.mustAllowCellZY(tabContext.rootHostname, tabContext.rootHostname, '*') === false;
var tabContext = µb.tabContextManager.lookup(this.tabId);
return tabContext !== null &&
µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) !== true;
};
/******************************************************************************/
PageStore.prototype.getGenericCosmeticFilteringSwitch = function() {
if ( this.skipCosmeticFiltering ) {
return false;
}
return this.getSpecificCosmeticFilteringSwitch();
return this.skipCosmeticFiltering !== true &&
this.getSpecificCosmeticFilteringSwitch();
};
/******************************************************************************/