Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: lib/popupBlocker.js

Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Left Patch Set: Remove the arrow-parens rule Created March 9, 2017, 10:15 a.m.
Right Patch Set: Use .includes again Created March 31, 2017, 8:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/notificationHelper.js ('k') | lib/prefs.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2017 eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 logRequest( 68 logRequest(
69 popup.sourcePage, urlString, "POPUP", 69 popup.sourcePage, urlString, "POPUP",
70 documentHost, thirdParty, null, 70 documentHost, thirdParty, null,
71 specificOnly, filter 71 specificOnly, filter
72 ); 72 );
73 } 73 }
74 74
75 function onPopupURLChanged(details) 75 function onPopupURLChanged(details)
76 { 76 {
77 // Ignore frames inside the popup window.
78 if (details.frameId != 0)
79 return;
80
77 let popup = loadingPopups[details.tabId]; 81 let popup = loadingPopups[details.tabId];
78 if (popup) 82 if (popup)
79 { 83 {
80 popup.url = details.url; 84 popup.url = details.url;
81 if (popup.sourceFrame) 85 if (popup.sourceFrame)
82 checkPotentialPopup(details.tabId, popup); 86 checkPotentialPopup(details.tabId, popup);
83 } 87 }
84 } 88 }
85 89
86 function onCompleted(details) 90 function onCompleted(details)
(...skipping 20 matching lines...) Expand all
107 111
108 let {tabId} = details; 112 let {tabId} = details;
109 let popup = loadingPopups[tabId] = { 113 let popup = loadingPopups[tabId] = {
110 url: details.url, 114 url: details.url,
111 sourcePage: new ext.Page({id: details.sourceTabId}), 115 sourcePage: new ext.Page({id: details.sourceTabId}),
112 sourceFrame: null 116 sourceFrame: null
113 }; 117 };
114 let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId); 118 let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
115 119
116 if (checkWhitelisted(popup.sourcePage, frame)) 120 if (checkWhitelisted(popup.sourcePage, frame))
121 {
117 forgetPopup(tabId); 122 forgetPopup(tabId);
123 }
118 else 124 else
119 { 125 {
120 popup.sourceFrame = frame; 126 popup.sourceFrame = frame;
121 checkPotentialPopup(tabId, popup); 127 checkPotentialPopup(tabId, popup);
122 } 128 }
123 }); 129 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld