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

Delta Between Two Patch Sets: lib/prefs.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Created Jan. 13, 2017, 12:11 p.m.
Right Patch Set: Addressed some more feedback Created Jan. 18, 2017, 11:44 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/popupBlocker.js ('k') | lib/requestBlocker.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module prefs */ 18 /** @module prefs */
19 19
20 let {EventEmitter} = require("events"); 20 "use strict";
21
22 const {EventEmitter} = require("events");
21 23
22 const keyPrefix = "pref:"; 24 const keyPrefix = "pref:";
23 25
24 let eventEmitter = new EventEmitter(); 26 let eventEmitter = new EventEmitter();
25 let overrides = Object.create(null); 27 let overrides = Object.create(null);
26 28
27 /** @lends module:prefs.Prefs */ 29 /** @lends module:prefs.Prefs */
28 let defaults = Object.create(null); 30 let defaults = Object.create(null);
29 31
30 /** 32 /**
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 * @static 183 * @static
182 */ 184 */
183 let Prefs = exports.Prefs = { 185 let Prefs = exports.Prefs = {
184 /** 186 /**
185 * Adds a callback that is called when the 187 * Adds a callback that is called when the
186 * value of a specified preference changed. 188 * value of a specified preference changed.
187 * 189 *
188 * @param {string} preference 190 * @param {string} preference
189 * @param {function} callback 191 * @param {function} callback
190 */ 192 */
191 on: (preference, callback) => 193 on(preference, callback)
192 { 194 {
193 eventEmitter.on(preference, callback); 195 eventEmitter.on(preference, callback);
194 }, 196 },
195 197
196 /** 198 /**
197 * Removes a callback for the specified preference. 199 * Removes a callback for the specified preference.
198 * 200 *
199 * @param {string} preference 201 * @param {string} preference
200 * @param {function} callback 202 * @param {function} callback
201 */ 203 */
202 off: (preference, callback) => 204 off(preference, callback)
203 { 205 {
204 eventEmitter.off(preference, callback); 206 eventEmitter.off(preference, callback);
205 }, 207 },
206 208
207 /** 209 /**
208 * A promise that is fullfilled when all preferences have been loaded. 210 * A promise that is fullfilled when all preferences have been loaded.
209 * Wait for this promise to be fulfilled before using preferences during 211 * Wait for this promise to be fulfilled before using preferences during
210 * extension initialization. 212 * extension initialization.
211 * 213 *
212 * @type {Promise} 214 * @type {Promise}
(...skipping 10 matching lines...) Expand all
223 } 225 }
224 226
225 function prefToKey(pref) 227 function prefToKey(pref)
226 { 228 {
227 return keyPrefix + pref; 229 return keyPrefix + pref;
228 } 230 }
229 231
230 function addPreference(pref) 232 function addPreference(pref)
231 { 233 {
232 Object.defineProperty(Prefs, pref, { 234 Object.defineProperty(Prefs, pref, {
233 get: () => (pref in overrides ? overrides : defaults)[pref], 235 get() { return (pref in overrides ? overrides : defaults)[pref]; },
234 set: value => 236 set(value)
235 { 237 {
236 let defaultValue = defaults[pref]; 238 let defaultValue = defaults[pref];
237 239
238 if (typeof value != typeof defaultValue) 240 if (typeof value != typeof defaultValue)
239 throw new Error("Attempt to change preference type"); 241 throw new Error("Attempt to change preference type");
240 242
241 if (value == defaultValue) 243 if (value == defaultValue)
242 { 244 {
243 delete overrides[pref]; 245 delete overrides[pref];
244 ext.storage.remove(prefToKey(pref)); 246 ext.storage.remove(prefToKey(pref));
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 eventEmitter.emit(pref); 311 eventEmitter.emit(pref);
310 } 312 }
311 } 313 }
312 }); 314 });
313 } 315 }
314 316
315 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded); 317 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
316 } 318 }
317 319
318 init(); 320 init();
LEFTRIGHT

Powered by Google App Engine
This is Rietveld