Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some *indirect* loops in the BasePreferences.getAll-method

Browse Source 
In the `getAll`-method, we can have just one *explicit* loop rather than two indirect ones via the old `Object.assign`-call.

Also, changes the `get`-method to be slightly more compact (while keeping the logic intact).
This commit is contained in:
Jonas Jenwald 2021-03-22 14:30:03 +01:00
parent 4b27f58625
commit be52183211
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/preferences.js
View File

@ -125,18 +125,13 @@ class BasePreferences {
*/ */
async get(name) { async get(name) {
await this._initializedPromise; await this._initializedPromise;
const defaultValue = this.defaults[name]; const defaultValue = this.defaults[name],
prefValue = this.prefs[name];
if (defaultValue === undefined) { if (defaultValue === undefined) {
throw new Error(`Get preference: "${name}" is undefined.`); throw new Error(`Get preference: "${name}" is undefined.`);
} else {
const prefValue = this.prefs[name];
if (prefValue !== undefined) {
return prefValue;
}
} }
return defaultValue; return prefValue !== undefined ? prefValue : defaultValue;
} }
/** /**
@ -146,7 +141,13 @@ class BasePreferences {
*/ */
async getAll() { async getAll() {
await this._initializedPromise; await this._initializedPromise;
return Object.assign(Object.create(null), this.defaults, this.prefs); const obj = Object.create(null);
for (const name in this.defaults) {
const prefValue = this.prefs[name];
obj[name] = prefValue !== undefined ? prefValue : this.defaults[name];
}
return obj;
} }
} }