lib/popupBlocker.js - Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome

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 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)

Patch Set: Tidy up hasRecord and some notification logic Created March 31, 2017, 3:36 a.m.

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

Jump to:

Index: lib/popupBlocker.js

diff --git a/lib/popupBlocker.js b/lib/popupBlocker.js

index 9d3594ec4bb800119cb8546b07cfa484c38751a8..a7eb1cb8a5376875233fe86c40cceba82910caa5 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");

@@ -100,7 +100,7 @@ chrome.webNavigation.onCreatedNavigationTarget.addListener(details =>

chrome.webRequest.onBeforeRequest.addListener(

onPopupURLChanged,

{

- urls: ["<all_urls>"],

+ urls: ["<all_urls>"],

types: ["main_frame"]

}

);

@@ -109,7 +109,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}),