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

Delta Between Two Patch Sets: safari/include.youtube.js

Issue 29340571: Issue 3687 - Add experimental support for Safari content blockers (Closed)
Left Patch Set: Don't avoid type conversion Created May 18, 2016, 9:24 a.m.
Right 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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « safari/ext/content.js ('k') | skin/popup.css » ('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-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
(...skipping 11 matching lines...) Expand all
22 var usingContentBlockerAPI = true; 22 var usingContentBlockerAPI = true;
23 try 23 try
24 { 24 {
25 if (safari.self.tab.canLoad(beforeLoadEvent, 25 if (safari.self.tab.canLoad(beforeLoadEvent,
26 {category: "request", 26 {category: "request",
27 payload: {type: "prefs.get", 27 payload: {type: "prefs.get",
28 key: "safariContentBlocker"}}) != tru e) 28 key: "safariContentBlocker"}}) != tru e)
29 usingContentBlockerAPI = false; 29 usingContentBlockerAPI = false;
30 } 30 }
31 catch (e) 31 catch (e)
32 { } 32 {
33 }
33 34
34 if (usingContentBlockerAPI) 35 if (usingContentBlockerAPI)
35 return; 36 return;
36 37
37 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) 38 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"}))
38 return; 39 return;
39 40
40 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)$/;
41 42
42 function rewriteFlashvars(flashvars) 43 function rewriteFlashvars(flashvars)
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 config.args = rawConfig.args; 172 config.args = rawConfig.args;
172 } 173 }
173 } 174 }
174 }); 175 });
175 176
176 ytplayer.config = rawYtplayer.config; 177 ytplayer.config = rawYtplayer.config;
177 } 178 }
178 }); 179 });
179 }, badArgumentsRegex); 180 }, badArgumentsRegex);
180 })(); 181 })();
LEFTRIGHT

Powered by Google App Engine
This is Rietveld