Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/prefs.js

Issue 5653480979038208: Issue 2325 - Add a way to set settings in libadblockplus for FRP and automatic updates (Closed)
Patch Set: Remove the superfluous white space Created June 18, 2015, 10:34 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 23 matching lines...) Expand all
34 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/excep tionrules.txt", 34 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/excep tionrules.txt",
35 documentation_link: "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%" , 35 documentation_link: "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%" ,
36 update_url_release: "https://update.adblockplus.org/%NAME%/update.json?type=%T YPE%", 36 update_url_release: "https://update.adblockplus.org/%NAME%/update.json?type=%T YPE%",
37 update_url_devbuild: "https://adblockplus.org/devbuilds/%NAME%/update.json?typ e=%TYPE%", 37 update_url_devbuild: "https://adblockplus.org/devbuilds/%NAME%/update.json?typ e=%TYPE%",
38 update_last_check: 0, 38 update_last_check: 0,
39 update_last_error: 0, 39 update_last_error: 0,
40 update_soft_expiration: 0, 40 update_soft_expiration: 0,
41 update_hard_expiration: 0, 41 update_hard_expiration: 0,
42 currentVersion: "0.0", 42 currentVersion: "0.0",
43 notificationdata: {}, 43 notificationdata: {},
44 notificationurl: "https://notification.adblockplus.org/notification.json" 44 notificationurl: "https://notification.adblockplus.org/notification.json",
45 suppress_first_run_page: false,
46 disable_auto_updates: false
45 }; 47 };
46 48
47 let values = Object.create(defaults); 49 let preconfigurable = ["suppress_first_run_page", "disable_auto_updates"];
sergei 2015/06/19 10:07:16 I saw the comment that `preconfigurable` is an arr
Felix Dahlke 2015/06/22 07:33:58 You mean splitting up defaults into two objects, p
Oleksandr 2015/06/22 07:47:10 I don't think this is a code duplication, really.
sergei 2015/06/22 09:10:49 Let me break the original quotes to comment them a
Eric 2015/06/25 17:44:40 It is bad practice not to specify default values f
50
51 let values;
48 let path = _fileSystem.resolve("prefs.json"); 52 let path = _fileSystem.resolve("prefs.json");
49 let listeners = []; 53 let listeners = [];
50 let isDirty = false; 54 let isDirty = false;
51 let isSaving = false; 55 let isSaving = false;
52 56
53 function defineProperty(key) 57 function defineProperty(key)
54 { 58 {
55 Object.defineProperty(Prefs, key, 59 Object.defineProperty(Prefs, key,
56 { 60 {
57 get: () => values[key], 61 get: () => values[key],
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 }, 128 },
125 129
126 removeListener: function(listener) 130 removeListener: function(listener)
127 { 131 {
128 let index = listeners.indexOf(listener); 132 let index = listeners.indexOf(listener);
129 if (index >= 0) 133 if (index >= 0)
130 listeners.splice(index, 1); 134 listeners.splice(index, 1);
131 }, 135 },
132 }; 136 };
133 137
138 // Update the default prefs with what was preconfigured
139 for (let key in _preconfiguredPrefs)
140 if (preconfigurable.indexOf(key) != -1)
141 defaults[key] = _preconfiguredPrefs[key];
142
143 // Define defaults
134 for (let key in defaults) 144 for (let key in defaults)
135 defineProperty(key); 145 defineProperty(key);
136 146
147 // Set values of prefs based on defaults
148 values = Object.create(defaults);
149
137 load(); 150 load();
OLDNEW

Powered by Google App Engine
This is Rietveld