| Index: lib/popupBlocker.js |
| =================================================================== |
| --- a/lib/popupBlocker.js |
| +++ b/lib/popupBlocker.js |
| @@ -14,21 +14,22 @@ |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| /** @module popupBlocker */ |
| "use strict"; |
| -const {defaultMatcher} = require("matcher"); |
| -const {BlockingFilter, RegExpFilter} = require("filterClasses"); |
| -const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); |
| -const {checkWhitelisted} = require("whitelisting"); |
| -const {logRequest} = require("devtools"); |
| +const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| +const {BlockingFilter, RegExpFilter} = require( |
|
kzar
2018/03/19 21:50:08
Better to do it like this in this instance:
const
Jon Sonesen
2018/03/20 23:25:18
Acknowledged.
|
| +"../adblockpluscore/lib/filterClasses"); |
| +const {stringifyURL, isThirdParty, extractHostFromFrame} = require("./url"); |
| +const {checkWhitelisted} = require("./whitelisting"); |
| +const {logRequest} = require("./devtools"); |
| let loadingPopups = new Map(); |
| function forgetPopup(tabId) |
| { |
| loadingPopups.delete(tabId); |
| if (loadingPopups.size == 0) |