| 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 /** | 170 /** |
| 171 * Additonal subscriptions to be automatically added when the extension is | 171 * Additonal subscriptions to be automatically added when the extension is |
| 172 * loaded. This preference isn't set by the extension but can be pre-configured | 172 * loaded. This preference isn't set by the extension but can be pre-configured |
| 173 * externally. | 173 * externally. |
| 174 * | 174 * |
| 175 * @type {string[]} | 175 * @type {string[]} |
| 176 */ | 176 */ |
| 177 defaults.additional_subscriptions = []; | 177 defaults.additional_subscriptions = []; |
| 178 | 178 |
| 179 /** | 179 /** |
| 180 * Whether to enable the use of Safari's content blocker mechanism. |
| 181 */ |
| 182 defaults.safariContentBlocker = false; |
| 183 |
| 184 /** |
| 180 * @namespace | 185 * @namespace |
| 181 * @static | 186 * @static |
| 182 */ | 187 */ |
| 183 let Prefs = exports.Prefs = { | 188 let Prefs = exports.Prefs = { |
| 184 /** | 189 /** |
| 185 * Adds a callback that is called when the | 190 * Adds a callback that is called when the |
| 186 * value of a specified preference changed. | 191 * value of a specified preference changed. |
| 187 * | 192 * |
| 188 * @param {string} preference | 193 * @param {string} preference |
| 189 * @param {function} callback | 194 * @param {function} callback |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 eventEmitter.emit(pref); | 317 eventEmitter.emit(pref); |
| 313 } | 318 } |
| 314 } | 319 } |
| 315 }); | 320 }); |
| 316 } | 321 } |
| 317 | 322 |
| 318 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded); | 323 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded); |
| 319 } | 324 } |
| 320 | 325 |
| 321 init(); | 326 init(); |
| OLD | NEW |