Reduce some duplication for AppOptions that use compatibilityParams

We can check for a relevant `compatibilityParams`-entry directly in `AppOptions.{get, getAll}` instead, which removes some unnecessary duplication.
This commit is contained in:
Jonas Jenwald 2022-06-16 16:51:33 +02:00
parent df79b18a31
commit a19feac217

View File

@ -137,7 +137,6 @@ const defaultOptions = {
maxCanvasPixels: { maxCanvasPixels: {
/** @type {number} */ /** @type {number} */
value: 16777216, value: 16777216,
compatibility: compatibilityParams.maxCanvasPixels,
kind: OptionKind.VIEWER, kind: OptionKind.VIEWER,
}, },
pageColorsBackground: { pageColorsBackground: {
@ -314,9 +313,6 @@ if (
: "../build/pdf.sandbox.js", : "../build/pdf.sandbox.js",
kind: OptionKind.VIEWER, kind: OptionKind.VIEWER,
}; };
defaultOptions.annotationEditorEnabled.compatibility =
compatibilityParams.annotationEditorEnabled;
} else if (PDFJSDev.test("CHROME")) { } else if (PDFJSDev.test("CHROME")) {
defaultOptions.disableTelemetry = { defaultOptions.disableTelemetry = {
/** @type {boolean} */ /** @type {boolean} */
@ -344,7 +340,7 @@ class AppOptions {
} }
const defaultOption = defaultOptions[name]; const defaultOption = defaultOptions[name];
if (defaultOption !== undefined) { if (defaultOption !== undefined) {
return defaultOption.compatibility ?? defaultOption.value; return compatibilityParams[name] ?? defaultOption.value;
} }
return undefined; return undefined;
} }
@ -376,7 +372,7 @@ class AppOptions {
options[name] = options[name] =
userOption !== undefined userOption !== undefined
? userOption ? userOption
: defaultOption.compatibility ?? defaultOption.value; : compatibilityParams[name] ?? defaultOption.value;
} }
return options; return options;
} }