| 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-2015 Eyeo GmbH | 3  * Copyright (C) 2006-2015 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 15 matching lines...) Expand all  Loading... | 
| 26   if (prefsInitDone && filtersInitDone) | 26   if (prefsInitDone && filtersInitDone) | 
| 27   { | 27   { | 
| 28     checkInitialized = function() {}; | 28     checkInitialized = function() {}; | 
| 29     _triggerEvent("init", require("filterStorage").FilterStorage.firstRun); | 29     _triggerEvent("init", require("filterStorage").FilterStorage.firstRun); | 
| 30   } | 30   } | 
| 31 } | 31 } | 
| 32 | 32 | 
| 33 Prefs._initListener = function() | 33 Prefs._initListener = function() | 
| 34 { | 34 { | 
| 35   prefsInitDone = true; | 35   prefsInitDone = true; | 
|  | 36 | 
|  | 37   // Override Prefs to Preconfig | 
|  | 38   for (var pref in Preconfig) | 
|  | 39   { | 
|  | 40     if (Preconfig.hasOwnProperty(pref)) | 
|  | 41     { | 
|  | 42       Prefs[pref] = Preconfig[pref]; | 
|  | 43     } | 
|  | 44   } | 
|  | 45 | 
| 36   checkInitialized(); | 46   checkInitialized(); | 
| 37 }; | 47 }; | 
| 38 | 48 | 
| 39 FilterNotifier.addListener(function(action) | 49 FilterNotifier.addListener(function(action) | 
| 40 { | 50 { | 
| 41   if (action === "load") | 51   if (action === "load") | 
| 42   { | 52   { | 
| 43     let {FilterStorage} = require("filterStorage"); | 53     let {FilterStorage} = require("filterStorage"); | 
| 44     if (FilterStorage.firstRun) | 54     if (FilterStorage.firstRun) | 
| 45     { | 55     { | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 63         subscription.homepage = node.homepage; | 73         subscription.homepage = node.homepage; | 
| 64         if (subscription instanceof DownloadableSubscription && !subscription.la
    stDownload) | 74         if (subscription instanceof DownloadableSubscription && !subscription.la
    stDownload) | 
| 65           Synchronizer.execute(subscription); | 75           Synchronizer.execute(subscription); | 
| 66       } | 76       } | 
| 67     } | 77     } | 
| 68 | 78 | 
| 69     filtersInitDone = true; | 79     filtersInitDone = true; | 
| 70     checkInitialized(); | 80     checkInitialized(); | 
| 71   } | 81   } | 
| 72 }); | 82 }); | 
| OLD | NEW | 
|---|