 Issue 29345734:
  Issue 4141 - Safari: Fixed blocking of video ads on YouTube  (Closed)
    
  
    Issue 29345734:
  Issue 4141 - Safari: Fixed blocking of video ads on YouTube  (Closed) 
  | 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"); | |
| 
Sebastian Noack
2016/06/11 20:56:34
I wonder whether we couldn't simply use ext.backgr
 
Sebastian Noack
2016/06/11 21:00:30
sendMessageSync() I meant.
 | |
| 26 beforeLoadEvent.initEvent("beforeload"); | |
| 25 if (safari.self.tab.canLoad(beforeLoadEvent, | 27 if (safari.self.tab.canLoad(beforeLoadEvent, | 
| 26 {category: "request", | 28 {category: "request", | 
| 27 payload: {type: "prefs.get", | 29 payload: {type: "prefs.get", | 
| 28 key: "safariContentBlocker"}}) != tru e) | 30 key: "safariContentBlocker"}}) != tru e) | 
| 29 usingContentBlockerAPI = false; | 31 usingContentBlockerAPI = false; | 
| 30 } | 32 } | 
| 31 catch (e) | 33 catch (e) | 
| 32 { | 34 { | 
| 33 } | 35 } | 
| 34 | 36 | 
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 config.args = rawConfig.args; | 174 config.args = rawConfig.args; | 
| 173 } | 175 } | 
| 174 } | 176 } | 
| 175 }); | 177 }); | 
| 176 | 178 | 
| 177 ytplayer.config = rawYtplayer.config; | 179 ytplayer.config = rawYtplayer.config; | 
| 178 } | 180 } | 
| 179 }); | 181 }); | 
| 180 }, badArgumentsRegex); | 182 }, badArgumentsRegex); | 
| 181 })(); | 183 })(); | 
| OLD | NEW |