| Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 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 { | |
| 
 
Sebastian Noack
2016/05/12 11:12:23
Nit: Open brace on new line.
 
kzar
2016/05/17 15:15:41
Done.
 
 | |
| 24 if (safari.self.tab.canLoad(beforeLoadEvent, | |
| 25 {category: "usingContentBlockerAPI"}) != true) | |
| 26 usingContentBlockerAPI = false; | |
| 27 } | |
| 28 catch (e) { }; | |
| 29 | |
| 30 if (usingContentBlockerAPI) | |
| 31 return; | |
| 32 | |
| 22 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) | 33 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) | 
| 23 return; | 34 return; | 
| 24 | 35 | 
| 25 var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|pr erolls|interstitial|infringe|iv_cta_url)$/; | 36 var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|pr erolls|interstitial|infringe|iv_cta_url)$/; | 
| 26 | 37 | 
| 27 function rewriteFlashvars(flashvars) | 38 function rewriteFlashvars(flashvars) | 
| 28 { | 39 { | 
| 29 var pairs = flashvars.split("&"); | 40 var pairs = flashvars.split("&"); | 
| 30 for (var i = 0; i < pairs.length; i++) | 41 for (var i = 0; i < pairs.length; i++) | 
| 31 if (badArgumentsRegex.test(pairs[i].split("=")[0])) | 42 if (badArgumentsRegex.test(pairs[i].split("=")[0])) | 
| 32 pairs.splice(i--, 1); | 43 pairs.splice(i--, 1); | 
| 33 return pairs.join("&"); | 44 return pairs.join("&"); | 
| 34 } | 45 } | 
| 35 | 46 | 
| 36 function patchPlayer(player) | 47 function patchPlayer(player) | 
| 37 { | 48 { | 
| 38 var newPlayer = player.cloneNode(true); | 49 var newPlayer = player.cloneNode(true); | 
| 39 var flashvarsChanged = false; | 50 var flashvarsChanged = false; | 
| 40 | 51 | 
| 41 var flashvars = newPlayer.getAttribute("flashvars"); | 52 var flashvars = newPlayer.getAttribute("flashvars"); | 
| 42 if (flashvars) | 53 if (flashvars) | 
| 43 { | 54 { | 
| 44 var newFlashvars = rewriteFlashvars(flashvars); | 55 var newFlashvars = rewriteFlashvars(flashvars); | 
| 45 if (flashvars != newFlashvars) | 56 if (flashvars != newFlashvars) | 
| 46 { | 57 { | 
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 config.args = rawConfig.args; | 167 config.args = rawConfig.args; | 
| 157 } | 168 } | 
| 158 } | 169 } | 
| 159 }); | 170 }); | 
| 160 | 171 | 
| 161 ytplayer.config = rawYtplayer.config; | 172 ytplayer.config = rawYtplayer.config; | 
| 162 } | 173 } | 
| 163 }); | 174 }); | 
| 164 }, badArgumentsRegex); | 175 }, badArgumentsRegex); | 
| 165 })(); | 176 })(); | 
| OLD | NEW |