| 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 | 
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 | 139 | 
| 140 ignoreFilterNotifications = true; | 140 ignoreFilterNotifications = true; | 
| 141 setTimeout(() => | 141 setTimeout(() => | 
| 142 { | 142 { | 
| 143 ignoreFilterNotifications = false; | 143 ignoreFilterNotifications = false; | 
| 144 ext.webRequest.handlerBehaviorChanged(); | 144 ext.webRequest.handlerBehaviorChanged(); | 
| 145 FilterNotifier.emit("filter.behaviorChanged"); | 145 FilterNotifier.emit("filter.behaviorChanged"); | 
| 146 }); | 146 }); | 
| 147 } | 147 } | 
| 148 | 148 | 
| 149 FilterNotifier.on("subscription.added", onFilterChange) | 149 FilterNotifier.on("subscription.added", onFilterChange); | 
| 150 FilterNotifier.on("subscription.removed", onFilterChange); | 150 FilterNotifier.on("subscription.removed", onFilterChange); | 
| 151 FilterNotifier.on("subscription.updated", onFilterChange); | 151 FilterNotifier.on("subscription.updated", onFilterChange); | 
| 152 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); | 152 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); | 
| 153 FilterNotifier.on("filter.added", onFilterChange); | 153 FilterNotifier.on("filter.added", onFilterChange); | 
| 154 FilterNotifier.on("filter.removed", onFilterChange); | 154 FilterNotifier.on("filter.removed", onFilterChange); | 
| 155 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); | 155 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); | 
| 156 FilterNotifier.on("load", onFilterChange); | 156 FilterNotifier.on("load", onFilterChange); | 
| 157 | |
| 158 port.on("websocket-request", function(msg, sender) | |
| 159 { | |
| 160 var results = ext.webRequest.onBeforeRequest._dispatch( | |
| 
 
Sebastian Noack
2016/08/08 16:42:55
Nit: We prefer block scoping (i.e. "let") in modul
 
kzar
2016/08/08 18:19:06
Done.
 
 | |
| 161 new URL(msg.url), | |
| 162 "OTHER", | |
| 163 sender.page, | |
| 164 sender.frame | |
| 165 ); | |
| 166 return results.indexOf(false) != -1; | |
| 167 }); | |
| OLD | NEW |