| Index: lib/popupBlocker.js |
| diff --git a/lib/popupBlocker.js b/lib/popupBlocker.js |
| index 55cb4e594da873c5a5bb24e62dea09989d3f63d8..3806abc9632e5a4f7c320855b6bf898cb1b32b6d 100644 |
| --- a/lib/popupBlocker.js |
| +++ b/lib/popupBlocker.js |
| @@ -20,7 +20,7 @@ |
| "use strict"; |
| const {defaultMatcher} = require("matcher"); |
| -const {BlockingFilter} = require("filterClasses"); |
| +const {BlockingFilter, RegExpFilter} = require("filterClasses"); |
| const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); |
| const {checkWhitelisted} = require("whitelisting"); |
| const {logRequest} = require("devtools"); |
| @@ -96,7 +96,7 @@ chrome.webNavigation.onCreatedNavigationTarget.addListener(details => |
| chrome.webRequest.onBeforeRequest.addListener( |
| onPopupURLChanged, |
| { |
| - urls: ["<all_urls>"], |
| + urls: ["<all_urls>"], |
| types: ["main_frame"] |
| } |
| ); |
| @@ -105,7 +105,7 @@ chrome.webNavigation.onCreatedNavigationTarget.addListener(details => |
| chrome.tabs.onRemoved.addListener(forgetPopup); |
| } |
| - let tabId = details.tabId; |
| + let {tabId} = details; |
| let popup = loadingPopups[tabId] = { |
| url: details.url, |
| sourcePage: new ext.Page({id: details.sourceTabId}), |
| @@ -114,9 +114,7 @@ chrome.webNavigation.onCreatedNavigationTarget.addListener(details => |
| let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId); |
| if (checkWhitelisted(popup.sourcePage, frame)) |
| - { |
| forgetPopup(tabId); |
| - } |
| else |
| { |
| popup.sourceFrame = frame; |