external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 09:07:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

this fixes #581

Browse source
This commit is contained in:
gorhill 2015-08-17 15:09:14 -04:00
parent 096e85f313
commit ccb058c2d9
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/js/tab.js
View file

@ -496,8 +496,8 @@ vAPI.tabs.onPopup = function(details) {
requestType: 'popup'
};
var pageStore = µb.pageStoreFromTabId(details.openerTabId);
var result = '';
var loggerEnabled = µb.logger.isEnabled();
// Check user switch first
if ( µb.hnSwitches.evaluateZ('no-popups', openerHostname) ) {
@ -506,22 +506,19 @@ vAPI.tabs.onPopup = function(details) {
// https://github.com/chrisaljoudi/uBlock/issues/323
// https://github.com/chrisaljoudi/uBlock/issues/1142
// Don't block if uBlock is turned off in popup's context
if (
result === '' &&
µb.getNetFilteringSwitch(targetURL) &&
µb.staticNetFilteringEngine.matchStringExactType(context, targetURL, 'popup') !== undefined
) {
result = µb.staticNetFilteringEngine.toResultString(loggerEnabled);
// Don't block if uBlock is turned off in popup's context
// https://github.com/gorhill/uBlock/issues/581
// Take into account dynamic filtering.
if ( result === '' && pageStore && µb.getNetFilteringSwitch(targetURL) ) {
result = pageStore.filterRequestNoCache(context);
}
// https://github.com/chrisaljoudi/uBlock/issues/91
var pageStore = µb.pageStoreFromTabId(details.openerTabId);
if ( pageStore ) {
pageStore.logRequest(context, result);
}
if ( loggerEnabled ) {
if ( µb.logger.isEnabled() ) {
µb.logger.writeOne(
details.openerTabId,
'net',