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

Side by Side Diff: popupBlocker.js

Issue 5088751004942336: Issue 370 - Right-clicked element is removed independent of created filter (Closed)
Patch Set: Rebase to rev 3c9cea80c481 Created July 18, 2014, 8:54 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « popup.js ('k') | qunit/common.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 if (require("info").platform == "chromium" && "webNavigation" in chrome) 18 if (require("info").platform == "chromium")
19 { 19 {
20 var tabsLoading = {}; 20 var tabsLoading = {};
21 21
22 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) 22 chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
23 { 23 {
24 if (isFrameWhitelisted(details.sourceTabId, details.sourceFrameId)) 24 var sourcePage = new ext.Page({id: details.sourceTabId});
25 var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
26
27 if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame))
25 return; 28 return;
26 29
27 var openerUrl = getFrameUrl(details.sourceTabId, details.sourceFrameId); 30 var openerUrl = sourceFrame.url;
28 if (!openerUrl) 31 if (!openerUrl)
29 { 32 {
30 // We don't know the opener tab 33 // We don't know the opener tab
31 return; 34 return;
32 } 35 }
33 tabsLoading[details.tabId] = openerUrl; 36 tabsLoading[details.tabId] = openerUrl;
34 37
35 checkPotentialPopup(details.tabId, details.url, openerUrl); 38 checkPotentialPopup(details.tabId, details.url, openerUrl);
36 }); 39 });
37 40
(...skipping 15 matching lines...) Expand all
53 56
54 function checkPotentialPopup(tabId, url, opener) 57 function checkPotentialPopup(tabId, url, opener)
55 { 58 {
56 var requestHost = extractHostFromURL(url); 59 var requestHost = extractHostFromURL(url);
57 var documentHost = extractHostFromURL(opener); 60 var documentHost = extractHostFromURL(opener);
58 var thirdParty = isThirdParty(requestHost, documentHost); 61 var thirdParty = isThirdParty(requestHost, documentHost);
59 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty); 62 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty);
60 if (filter instanceof BlockingFilter) 63 if (filter instanceof BlockingFilter)
61 chrome.tabs.remove(tabId); 64 chrome.tabs.remove(tabId);
62 } 65 }
OLDNEW
« no previous file with comments | « popup.js ('k') | qunit/common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld