Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-24 03:12:46 +01:00
Code Issues Releases Wiki Activity

fix #3053

Browse Source
This commit is contained in:
gorhill 2017-09-26 07:54:06 -04:00
parent 1402710a1e
commit 83ff2ef26e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/js/tab.js
View File

@ -656,7 +656,7 @@ vAPI.tabs.onPopupUpdated = (function() {
}; };
var popunderMatch = function(openerURL, targetURL) { var popunderMatch = function(openerURL, targetURL) {
var result = popupMatch(targetURL, openerURL, null, 'popunder'); var result = popupMatch(targetURL, openerURL, 'popunder');
if ( result === 1 ) { if ( result === 1 ) {
return result; return result;
} }
@ -674,7 +674,7 @@ vAPI.tabs.onPopupUpdated = (function() {
result = mapPopunderResult( result = mapPopunderResult(
popunderURL, popunderURL,
popunderHostname, popunderHostname,
popupMatch(targetURL, popunderURL, null, 'popup') popupMatch(targetURL, popunderURL, 'popup')
); );
if ( result !== 0 ) { if ( result !== 0 ) {
return result; return result;
@ -688,7 +688,7 @@ vAPI.tabs.onPopupUpdated = (function() {
return mapPopunderResult( return mapPopunderResult(
popunderURL, popunderURL,
popunderHostname, popunderHostname,
popupMatch(targetURL, popunderURL, null, 'popup') popupMatch(targetURL, popunderURL, 'popup')
); );
}; };
@ -725,18 +725,17 @@ vAPI.tabs.onPopupUpdated = (function() {
} }
} }
// https://github.com/gorhill/uBlock/issues/2919
// - The target tab matches a clicked link, assume it's legit.
if (
openerTabId === µb.mouseEventRegister.tabId &&
areDifferentURLs(targetURL, µb.mouseEventRegister.url) === false
) {
return;
}
// Popup test. // Popup test.
var popupType = 'popup', var popupType = 'popup',
result = 0;
// https://github.com/gorhill/uBlock/issues/2919
// - If the target tab matches a clicked link, assume it's legit.
if (
openerTabId !== µb.mouseEventRegister.tabId ||
areDifferentURLs(targetURL, µb.mouseEventRegister.url)
) {
result = popupMatch(openerURL, targetURL, 'popup'); result = popupMatch(openerURL, targetURL, 'popup');
}
// Popunder test. // Popunder test.
if ( result === 0 ) { if ( result === 0 ) {