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; | 22 var usingContentBlockerAPI = true; |
23 try | 23 try |
24 { | 24 { |
25 var beforeLoadEvent = document.createEvent("Event"); | 25 if (ext.backgroundPage.sendMessageSync({type: "prefs.get", |
26 beforeLoadEvent.initEvent("beforeload"); | 26 key: "safariContentBlocker"} != true )) |
Sebastian Noack
2016/09/16 14:06:43
Here is a typo. You are essentially always calling
kzar
2016/09/16 14:10:36
Whoops you are right, fixed.
| |
27 if (safari.self.tab.canLoad(beforeLoadEvent, | |
28 {category: "request", | |
29 payload: {type: "prefs.get", | |
30 key: "safariContentBlocker"}}) != tru e) | |
31 usingContentBlockerAPI = false; | 27 usingContentBlockerAPI = false; |
32 } | 28 } |
33 catch (e) | 29 catch (e) |
34 { | 30 { |
35 } | 31 } |
36 | 32 |
37 if (usingContentBlockerAPI) | 33 if (usingContentBlockerAPI) |
38 return; | 34 return; |
39 | 35 |
40 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) | 36 if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"})) |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
166 config.args = rawConfig.args; | 162 config.args = rawConfig.args; |
167 } | 163 } |
168 } | 164 } |
169 }); | 165 }); |
170 | 166 |
171 ytplayer.config = rawYtplayer.config; | 167 ytplayer.config = rawYtplayer.config; |
172 } | 168 } |
173 }); | 169 }); |
174 }, badArgumentsRegex.source); | 170 }, badArgumentsRegex.source); |
175 })(); | 171 })(); |
OLD | NEW |