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

Side by Side Diff: safari/include.youtube.js

Issue 29340571: Issue 3687 - Add experimental support for Safari content blockers (Closed)
Patch Set: Addressed Nits Created May 18, 2016, 11:30 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 | « safari/ext/content.js ('k') | skin/popup.css » ('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 <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-2016 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 (function() { 18 (function() {
19 if (document.domain != "www.youtube.com") 19 if (document.domain != "www.youtube.com")
20 return; 20 return;
21 21
22 var usingContentBlockerAPI = true;
23 try
24 {
25 if (safari.self.tab.canLoad(beforeLoadEvent,
26 {category: "request",
27 payload: {type: "prefs.get",
28 key: "safariContentBlocker"}}) != tru e)
29 usingContentBlockerAPI = false;
30 }
31 catch (e)
32 {
33 }
34
35 if (usingContentBlockerAPI)
36 return;
37
22 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) 38 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"}))
23 return; 39 return;
24 40
25 var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|pr erolls|interstitial|infringe|iv_cta_url)$/; 41 var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|pr erolls|interstitial|infringe|iv_cta_url)$/;
26 42
27 function rewriteFlashvars(flashvars) 43 function rewriteFlashvars(flashvars)
28 { 44 {
29 var pairs = flashvars.split("&"); 45 var pairs = flashvars.split("&");
30 for (var i = 0; i < pairs.length; i++) 46 for (var i = 0; i < pairs.length; i++)
31 if (badArgumentsRegex.test(pairs[i].split("=")[0])) 47 if (badArgumentsRegex.test(pairs[i].split("=")[0]))
32 pairs.splice(i--, 1); 48 pairs.splice(i--, 1);
33 return pairs.join("&"); 49 return pairs.join("&");
34 } 50 }
35 51
36 function patchPlayer(player) 52 function patchPlayer(player)
37 { 53 {
38 var newPlayer = player.cloneNode(true); 54 var newPlayer = player.cloneNode(true);
39 var flashvarsChanged = false; 55 var flashvarsChanged = false;
40 56
41 var flashvars = newPlayer.getAttribute("flashvars"); 57 var flashvars = newPlayer.getAttribute("flashvars");
42 if (flashvars) 58 if (flashvars)
43 { 59 {
44 var newFlashvars = rewriteFlashvars(flashvars); 60 var newFlashvars = rewriteFlashvars(flashvars);
45 if (flashvars != newFlashvars) 61 if (flashvars != newFlashvars)
46 { 62 {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 config.args = rawConfig.args; 172 config.args = rawConfig.args;
157 } 173 }
158 } 174 }
159 }); 175 });
160 176
161 ytplayer.config = rawYtplayer.config; 177 ytplayer.config = rawYtplayer.config;
162 } 178 }
163 }); 179 });
164 }, badArgumentsRegex); 180 }, badArgumentsRegex);
165 })(); 181 })();
OLDNEW
« no previous file with comments | « safari/ext/content.js ('k') | skin/popup.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld