1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-24 03:12:46 +01:00

revert fix for #1028: can't be fixed without bad side effects

This commit is contained in:
gorhill 2016-02-27 12:04:28 -05:00
parent 0777602a85
commit 02014f915e

View File

@ -696,7 +696,7 @@ vAPI.tabs.onPopupUpdated = (function() {
// Log only for when there was a hit against an actual filter (allow or block).
if ( µb.logger.isEnabled() ) {
µb.logger.writeOne(
openerTabId,
popupType === 'popup' ? openerTabId : targetTabId,
'net',
result,
popupType,
@ -725,11 +725,12 @@ vAPI.tabs.onPopupUpdated = (function() {
}
// It is a popup, block and remove the tab.
µb.unbindTabFromPageStats(targetTabId);
vAPI.tabs.remove(targetTabId, true);
if ( popupType === 'popunder' ) {
vAPI.tabs.replace(openerTabId, targetURL);
if ( popupType === 'popup' ) {
µb.unbindTabFromPageStats(targetTabId);
vAPI.tabs.remove(targetTabId, true);
} else {
µb.unbindTabFromPageStats(openerTabId);
vAPI.tabs.remove(openerTabId, true);
}
return true;