ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-08 09:20:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #18501 from Snuffleupagus/AppOptions-init

Browse source 
Initialize all user-options upfront in AppOptions
This commit is contained in:
Tim van der Meij 2024-07-28 11:09:11 +02:00 • committed by GitHub
commit d3384c0e3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

77
web/app_options.js
View file

@ -484,15 +484,6 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
}; };
} }
const userOptions = new Map();
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// Apply any compatibility-values to the user-options.
for (const [name, value] of compatParams) {
userOptions.set(name, value);
}
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING || LIB")) { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING || LIB")) {
// Ensure that the `defaultOptions` are correctly specified. // Ensure that the `defaultOptions` are correctly specified.
for (const name in defaultOptions) { for (const name in defaultOptions) {
@ -544,14 +535,44 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING || LIB")) {
class AppOptions { class AppOptions {
static eventBus; static eventBus;
static #opts = new Map();
static {
// Initialize all the user-options.
for (const name in defaultOptions) {
this.#opts.set(name, defaultOptions[name].value);
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// Apply any compatibility-values to the user-options.
for (const [name, value] of compatParams) {
this.#opts.set(name, value);
}
this._hasInvokedSet = false;
this._checkDisablePreferences = () => {
if (this.get("disablePreferences")) {
// Give custom implementations of the default viewer a simpler way to
// opt-out of having the `Preferences` override existing `AppOptions`.
return true;
}
if (this._hasInvokedSet) {
console.warn(
"The Preferences may override manually set AppOptions; " +
'please use the "disablePreferences"-option to prevent that.'
);
}
return false;
};
}
}
constructor() { constructor() {
throw new Error("Cannot initialize AppOptions."); throw new Error("Cannot initialize AppOptions.");
} }
static get(name) { static get(name) {
return userOptions.has(name) return this.#opts.get(name);
? userOptions.get(name)
: defaultOptions[name]?.value;
} }
static getAll(kind = null, defaultOnly = false) { static getAll(kind = null, defaultOnly = false) {
@ -562,10 +583,7 @@ class AppOptions {
if (kind && !(kind & defaultOpt.kind)) { if (kind && !(kind & defaultOpt.kind)) {
continue; continue;
} }
options[name] = options[name] = !defaultOnly ? this.#opts.get(name) : defaultOpt.value;
!defaultOnly && userOptions.has(name)
? userOptions.get(name)
: defaultOpt.value;
} }
return options; return options;
} }
@ -575,6 +593,9 @@ class AppOptions {
} }
static setAll(options, prefs = false) { static setAll(options, prefs = false) {
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
this._hasInvokedSet ||= true;
}
let events; let events;
for (const name in options) { for (const name in options) {
@ -601,7 +622,7 @@ class AppOptions {
if (this.eventBus && kind & OptionKind.EVENT_DISPATCH) { if (this.eventBus && kind & OptionKind.EVENT_DISPATCH) {
(events ||= new Map()).set(name, userOpt); (events ||= new Map()).set(name, userOpt);
} }
userOptions.set(name, userOpt); this.#opts.set(name, userOpt);
} }
if (events) { if (events) {
@ -612,26 +633,4 @@ class AppOptions {
} }
} }
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
AppOptions._checkDisablePreferences = () => {
if (AppOptions.get("disablePreferences")) {
// Give custom implementations of the default viewer a simpler way to
// opt-out of having the `Preferences` override existing `AppOptions`.
return true;
}
for (const [name] of userOptions) {
// Ignore any compatibility-values in the user-options.
if (compatParams.has(name)) {
continue;
}
console.warn(
"The Preferences may override manually set AppOptions; " +
'please use the "disablePreferences"-option to prevent that.'
);
break;
}
return false;
};
}
export { AppOptions, OptionKind }; export { AppOptions, OptionKind };