Unified Diff: lib/init.js
Issue 5653480979038208:
Issue 2325 - Add a way to set settings in libadblockplus for FRP and automatic updates (Closed)
Patch Set: Make the preconfiguration generic. Move FRP suppression to ABP engine.
Created June 9, 2015, 1:36 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« include/AdblockPlus/FilterEngine.h ('K')
|
« include/AdblockPlus/FilterEngine.h ('k')
|
lib/updater.js » ('j')
|
lib/updater.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/init.js |
| =================================================================== |
| --- a/lib/init.js |
| +++ b/lib/init.js |
| @@ -33,6 +33,16 @@ |
| Prefs._initListener = function() |
| { |
| prefsInitDone = true; |
| + |
| + // Override Prefs to Preconfig |
| + for (var pref in Preconfig) |
| + { |
| + if (Preconfig.hasOwnProperty(pref)) |
| + { |
| + Prefs[pref] = Preconfig[pref]; |
|
Felix Dahlke
2015/06/09 19:40:51
Rather than always overwriting the prefs, this is
|
| + } |
| + } |
| + |
| checkInitialized(); |
| }; |
« include/AdblockPlus/FilterEngine.h ('K')
|
« include/AdblockPlus/FilterEngine.h ('k')
|
lib/updater.js » ('j')
|
lib/updater.js » ('J')
