Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 10 matching lines...) Expand all Loading... | |
21 | 21 |
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) |
Sebastian Noack
2016/05/17 18:35:26
Nit: Redundant semicolon.
Also I wonder whether w
kzar
2016/05/17 19:20:23
Done.
| |
32 { | |
33 } | |
32 | 34 |
33 if (usingContentBlockerAPI) | 35 if (usingContentBlockerAPI) |
34 return; | 36 return; |
35 | 37 |
36 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) | 38 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) |
37 return; | 39 return; |
38 | 40 |
39 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)$/; |
40 | 42 |
41 function rewriteFlashvars(flashvars) | 43 function rewriteFlashvars(flashvars) |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 config.args = rawConfig.args; | 172 config.args = rawConfig.args; |
171 } | 173 } |
172 } | 174 } |
173 }); | 175 }); |
174 | 176 |
175 ytplayer.config = rawYtplayer.config; | 177 ytplayer.config = rawYtplayer.config; |
176 } | 178 } |
177 }); | 179 }); |
178 }, badArgumentsRegex); | 180 }, badArgumentsRegex); |
179 })(); | 181 })(); |
LEFT | RIGHT |