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

Merge pull request #11911 from Snuffleupagus/getDefaultPreferences-rm-SystemJS

Browse Source 
Remove the SystemJS dependency from the `web/preferences.js` file
This commit is contained in:
Tim van der Meij 2020-05-16 23:48:28 +02:00 committed by GitHub
commit 6ffcedc24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/preferences.js
View File

@ -13,23 +13,19 @@
* limitations under the License. * limitations under the License.
*/ */
import { AppOptions, OptionKind } from "./app_options.js";
let defaultPreferences = null; let defaultPreferences = null;
function getDefaultPreferences() { function getDefaultPreferences() {
if (!defaultPreferences) { if (!defaultPreferences) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("PRODUCTION")) { if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")) {
defaultPreferences = Promise.resolve(
AppOptions.getAll(OptionKind.PREFERENCE)
);
} else {
defaultPreferences = Promise.resolve( defaultPreferences = Promise.resolve(
PDFJSDev.json("$ROOT/build/default_preferences.json") PDFJSDev.json("$ROOT/build/default_preferences.json")
); );
} else {
defaultPreferences = new Promise(function (resolve, reject) {
if (typeof SystemJS === "object") {
SystemJS.import("./app_options.js").then(resolve, reject);
} else {
reject(new Error("SystemJS must be used to load AppOptions."));
}
}).then(function ({ AppOptions, OptionKind }) {
return AppOptions.getAll(OptionKind.PREFERENCE);
});
} }
} }
return defaultPreferences; return defaultPreferences;