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

Side by Side Diff: popupBlocker.js

Issue 16067002: Added Safari Support (Closed)
Patch Set: Created Nov. 9, 2013, 6:45 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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-2013 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 ("webNavigation" in chrome) 18 if ("chrome" in window && "webNavigation" in chrome)
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 if (isFrameWhitelisted(details.sourceTabId, details.sourceFrameId))
25 return; 25 return;
26 26
27 var openerUrl = getFrameUrl(details.sourceTabId, details.sourceFrameId); 27 var openerUrl = getFrameUrl(details.sourceTabId, details.sourceFrameId);
28 if (!openerUrl) 28 if (!openerUrl)
(...skipping 24 matching lines...) Expand all
53 53
54 function checkPotentialPopup(tabId, url, opener) 54 function checkPotentialPopup(tabId, url, opener)
55 { 55 {
56 var requestHost = extractHostFromURL(url); 56 var requestHost = extractHostFromURL(url);
57 var documentHost = extractHostFromURL(opener); 57 var documentHost = extractHostFromURL(opener);
58 var thirdParty = isThirdParty(requestHost, documentHost); 58 var thirdParty = isThirdParty(requestHost, documentHost);
59 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty); 59 var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", document Host, thirdParty);
60 if (filter instanceof BlockingFilter) 60 if (filter instanceof BlockingFilter)
61 chrome.tabs.remove(tabId); 61 chrome.tabs.remove(tabId);
62 } 62 }
OLDNEW
« no previous file with comments | « popup.js ('k') | safari/background.js » ('j') | safari/background.js » ('J')

Powered by Google App Engine
This is Rietveld