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

cosmetic filtering switch must disable ONLY cosmetic filtering. 

Before this fix, the turning off cosmetic filtering through the per-site
cosmetic filtering switch was also disabling the blocked resources
collapser.
This commit is contained in:
gorhill 2015-12-13 00:33:53 -05:00
parent 47f6a565fa
commit 9c12ef02bb
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/contentscript-start.js
View File

@ -134,9 +134,11 @@ var netFilters = function(details) {
var filteringHandler = function(details) { var filteringHandler = function(details) {
var styleTagCount = vAPI.styles.length; var styleTagCount = vAPI.styles.length;
vAPI.skipCosmeticFiltering = !details || details.skipCosmeticFiltering;
if ( details ) { if ( details ) {
if ( details.cosmeticHide.length !== 0 || details.cosmeticDonthide.length !== 0 ) { if (
(vAPI.skipCosmeticFiltering = details.skipCosmeticFiltering) !== true &&
(details.cosmeticHide.length !== 0 || details.cosmeticDonthide.length !== 0)
) {
cosmeticFilters(details); cosmeticFilters(details);
} }
if ( details.netHide.length !== 0 ) { if ( details.netHide.length !== 0 ) {

8
src/js/messaging.js
View File

@ -295,7 +295,8 @@ var popupDataFromTabId = function(tabId, tabTitle) {
pageAllowedRequestCount: 0, pageAllowedRequestCount: 0,
pageBlockedRequestCount: 0, pageBlockedRequestCount: 0,
tabId: tabId, tabId: tabId,
tabTitle: tabTitle tabTitle: tabTitle,
tooltipsDisabled: µb.userSettings.tooltipsDisabled
}; };
var pageStore = µb.pageStoreFromTabId(tabId); var pageStore = µb.pageStoreFromTabId(tabId);
@ -469,8 +470,11 @@ var onMessage = function(request, sender, callback) {
switch ( request.what ) { switch ( request.what ) {
case 'retrieveDomainCosmeticSelectors': case 'retrieveDomainCosmeticSelectors':
if ( pageStore && pageStore.getSpecificCosmeticFilteringSwitch() ) { if ( pageStore && pageStore.getNetFilteringSwitch() ) {
response = µb.cosmeticFilteringEngine.retrieveDomainSelectors(request); response = µb.cosmeticFilteringEngine.retrieveDomainSelectors(request);
if ( response && response.skipCosmeticFiltering !== true ) {
response.skipCosmeticFiltering = !pageStore.getSpecificCosmeticFilteringSwitch();
}
} }
break; break;

4
src/js/pagestore.js
View File

@ -447,10 +447,6 @@ PageStore.prototype.getNetFilteringSwitch = function() {
/******************************************************************************/ /******************************************************************************/
PageStore.prototype.getSpecificCosmeticFilteringSwitch = function() { PageStore.prototype.getSpecificCosmeticFilteringSwitch = function() {
if ( this.getNetFilteringSwitch() === false ) {
return false;
}
var tabContext = µb.tabContextManager.mustLookup(this.tabId); var tabContext = µb.tabContextManager.mustLookup(this.tabId);
if ( µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) ) { if ( µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) ) {