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

Merge pull request #12630 from Snuffleupagus/BasePreferences-less-async

Browse Source 
Reduce, now unnecessary, asynchronicity in the `BasePreferences` constructor
This commit is contained in:
Tim van der Meij 2020-11-17 00:07:06 +01:00 committed by GitHub
commit a06f487bd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
web/preferences.js
View File

@ -15,22 +15,6 @@
import { AppOptions, OptionKind } from "./app_options.js"; import { AppOptions, OptionKind } from "./app_options.js";
let defaultPreferences = null;
function getDefaultPreferences() {
if (!defaultPreferences) {
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")) {
defaultPreferences = Promise.resolve(
AppOptions.getAll(OptionKind.PREFERENCE)
);
} else {
defaultPreferences = Promise.resolve(
PDFJSDev.json("$ROOT/build/default_preferences.json")
);
}
}
return defaultPreferences;
}
/** /**
* BasePreferences - Abstract base class for storing persistent settings. * BasePreferences - Abstract base class for storing persistent settings.
* Used for settings that should be applied to all opened documents, * Used for settings that should be applied to all opened documents,
@ -41,21 +25,20 @@ class BasePreferences {
if (this.constructor === BasePreferences) { if (this.constructor === BasePreferences) {
throw new Error("Cannot initialize BasePreferences."); throw new Error("Cannot initialize BasePreferences.");
} }
this.prefs = null; Object.defineProperty(this, "defaults", {
value: Object.freeze(
typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")
? AppOptions.getAll(OptionKind.PREFERENCE)
: PDFJSDev.json("$ROOT/build/default_preferences.json")
),
writable: false,
enumerable: true,
configurable: false,
});
this.prefs = Object.assign(Object.create(null), this.defaults);
this._initializedPromise = getDefaultPreferences() this._initializedPromise = this._readFromStorage(this.defaults).then(
.then(defaults => { prefs => {
Object.defineProperty(this, "defaults", {
value: Object.freeze(defaults),
writable: false,
enumerable: true,
configurable: false,
});
this.prefs = Object.assign(Object.create(null), defaults);
return this._readFromStorage(defaults);
})
.then(prefs => {
if (!prefs) { if (!prefs) {
return; return;
} }
@ -72,7 +55,8 @@ class BasePreferences {
} }
this.prefs[name] = prefValue; this.prefs[name] = prefValue;
} }
}); }
);
} }
/** /**