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

Merge pull request #11825 from Snuffleupagus/extensions-viewer-less-AppOptions-lookup

Browse Source 
Avoid reading the "disablePreferences"/"locale" options, when initializing the viewer, in extension builds
This commit is contained in:
Tim van der Meij 2020-04-21 23:31:52 +02:00 committed by GitHub
commit 571f287983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app.js
View File

@ -229,7 +229,11 @@ const PDFViewerApplication = {
* @private * @private
*/ */
async _readPreferences() { async _readPreferences() {
if (AppOptions.get("disablePreferences") === true) { if (
(typeof PDFJSDev === "undefined" ||
PDFJSDev.test("!PRODUCTION || GENERIC")) &&
AppOptions.get("disablePreferences")
) {
// Give custom implementations of the default viewer a simpler way to // Give custom implementations of the default viewer a simpler way to
// opt-out of having the `Preferences` override existing `AppOptions`. // opt-out of having the `Preferences` override existing `AppOptions`.
return; return;
@ -328,9 +332,11 @@ const PDFViewerApplication = {
* @private * @private
*/ */
async _initializeL10n() { async _initializeL10n() {
this.l10n = this.externalServices.createL10n({ this.l10n = this.externalServices.createL10n(
locale: AppOptions.get("locale"), typeof PDFJSDev === "undefined" || PDFJSDev.test("!PRODUCTION || GENERIC")
}); ? { locale: AppOptions.get("locale") }
: null
);
const dir = await this.l10n.getDirection(); const dir = await this.l10n.getDirection();
document.getElementsByTagName("html")[0].dir = dir; document.getElementsByTagName("html")[0].dir = dir;
}, },

19
web/app_options.js
View File

@ -53,14 +53,14 @@ const defaultOptions = {
value: false, value: false,
kind: OptionKind.VIEWER + OptionKind.PREFERENCE, kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
}, },
/**
* The `disablePreferences` is, conditionally, defined below.
*/
enablePermissions: { enablePermissions: {
/** @type {boolean} */ /** @type {boolean} */
value: false, value: false,
kind: OptionKind.VIEWER + OptionKind.PREFERENCE, kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
}, },
/**
* The `disablePreferences` is, conditionally, defined below.
*/
enablePrintAutoRotate: { enablePrintAutoRotate: {
/** @type {boolean} */ /** @type {boolean} */
value: false, value: false,
@ -110,9 +110,11 @@ const defaultOptions = {
value: false, value: false,
kind: OptionKind.VIEWER + OptionKind.PREFERENCE, kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
}, },
/** printResolution: {
* The `printResolution` is, conditionally, defined below. /** @type {number} */
*/ value: 150,
kind: OptionKind.VIEWER,
},
renderer: { renderer: {
/** @type {string} */ /** @type {string} */
value: "canvas", value: "canvas",
@ -252,11 +254,6 @@ if (
value: typeof navigator !== "undefined" ? navigator.language : "en-US", value: typeof navigator !== "undefined" ? navigator.language : "en-US",
kind: OptionKind.VIEWER, kind: OptionKind.VIEWER,
}; };
defaultOptions.printResolution = {
/** @type {number} */
value: 150,
kind: OptionKind.VIEWER,
};
} }
const userOptions = Object.create(null); const userOptions = Object.create(null);