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

Change the userOptions, used with AppOptions, to a Map

Browse source 
This is needed for upcoming changes, and simplifies both checking if an entry exists and iteration of the entries.
This commit is contained in:
Jonas Jenwald 2024-07-21 09:25:29 +02:00
parent 57ee035573
commit 7bd920691f
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
web/app_options.js
View file

@ -442,13 +442,13 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
}; };
} }
const userOptions = Object.create(null); const userOptions = new Map();
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// Apply any compatibility-values to the user-options, // Apply any compatibility-values to the user-options,
// see also `AppOptions.remove` below. // see also `AppOptions.remove` below.
for (const [name, value] of compatParams) { for (const [name, value] of compatParams) {
userOptions[name] = value; userOptions.set(name, value);
} }
} }
@ -489,7 +489,9 @@ class AppOptions {
} }
static get(name) { static get(name) {
return userOptions[name] ?? defaultOptions[name]?.value ?? undefined; return userOptions.has(name)
? userOptions.get(name)
: defaultOptions[name]?.value;
} }
static getAll(kind = null, defaultOnly = false) { static getAll(kind = null, defaultOnly = false) {
@ -500,9 +502,10 @@ class AppOptions {
if (kind && !(kind & defaultOption.kind)) { if (kind && !(kind & defaultOption.kind)) {
continue; continue;
} }
options[name] = defaultOnly options[name] =
? defaultOption.value !defaultOnly && userOptions.has(name)
: (userOptions[name] ?? defaultOption.value); ? userOptions.get(name)
: defaultOption.value;
} }
return options; return options;
} }
@ -513,7 +516,7 @@ class AppOptions {
if (!defaultOption || typeof value !== typeof defaultOption.value) { if (!defaultOption || typeof value !== typeof defaultOption.value) {
return; return;
} }
userOptions[name] = value; userOptions.set(name, value);
} }
static setAll(options, prefs = false) { static setAll(options, prefs = false) {
@ -536,7 +539,7 @@ class AppOptions {
(events ||= new Map()).set(name, userOption); (events ||= new Map()).set(name, userOption);
} }
} }
userOptions[name] = userOption; userOptions.set(name, userOption);
} }
if (events) { if (events) {
@ -547,12 +550,12 @@ class AppOptions {
} }
static remove(name) { static remove(name) {
delete userOptions[name]; userOptions.delete(name);
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// Re-apply a compatibility-value, if it exists, to the user-options. // Re-apply a compatibility-value, if it exists, to the user-options.
if (compatParams.has(name)) { if (compatParams.has(name)) {
userOptions[name] = compatParams.get(name); userOptions.set(name, compatParams.get(name));
} }
} }
} }
@ -565,7 +568,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// opt-out of having the `Preferences` override existing `AppOptions`. // opt-out of having the `Preferences` override existing `AppOptions`.
return true; return true;
} }
for (const name in userOptions) { for (const [name] of userOptions) {
// Ignore any compatibility-values in the user-options. // Ignore any compatibility-values in the user-options.
if (compatParams.has(name)) { if (compatParams.has(name)) {
continue; continue;