lib/popupBlocker.js - Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: lib/popupBlocker.js

Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/

Patch Set: Compare CSP filters by text Created Jan. 31, 2019, 2:49 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/popupBlocker.js

===================================================================

--- a/lib/popupBlocker.js

+++ b/lib/popupBlocker.js

@@ -17,17 +17,18 @@

/** @module popupBlocker */

"use strict";

const {defaultMatcher} = require("../adblockpluscore/lib/matcher");

const {BlockingFilter,

RegExpFilter} = require("../adblockpluscore/lib/filterClasses");

-const {isThirdParty, extractHostFromFrame} = require("./url");

+const {isThirdParty} = require("../adblockpluscore/lib/domain");

+const {extractHostFromFrame} = require("./url");

const {checkWhitelisted} = require("./whitelisting");

const {logRequest} = require("./hitLogger");

let loadingPopups = new Map();

function forgetPopup(tabId)

{

loadingPopups.delete(tabId);

« no previous file with comments | « lib/hitLogger.js ('k') | lib/publicSuffixList.js » ('j') | no next file with comments »