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

Replace the OVERRIDES list in PDFViewerApplication._readPreferences with a disablePreferences, in GENERIC builds, `AppOption instead

Browse source 
Rather than having a (somewhat) randomly choosen list of Preferences which `AppOptions` are allowed to override, it makes much more sense to simply add an AppOption to allow custom implementations to ignore Preferences altogether (it's also inline with the AppOption that allows the `ViewHistory` to be bypassed on load).
This commit is contained in:
Jonas Jenwald 2018-11-29 11:31:49 +01:00
parent 1cb7cc9bf4
commit d9743e462d
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
web/app.js
View file

@ -169,21 +169,14 @@ let PDFViewerApplication = {
* @private * @private
*/ */
async _readPreferences() { async _readPreferences() {
// A subset of the Preferences that `AppOptions`, for compatibility reasons, if (AppOptions.get('disablePreferences') === true) {
// is allowed to override if the `AppOptions` values matches the ones below. // Give custom implementations of the default viewer a simpler way to
const OVERRIDES = { // opt-out of having the `Preferences` override existing `AppOptions`.
disableFontFace: true, return;
disableRange: true, }
disableStream: true,
textLayerMode: TextLayerMode.DISABLE,
};
try { try {
const prefs = await this.preferences.getAll(); const prefs = await this.preferences.getAll();
for (let name in prefs) { for (const name in prefs) {
if ((name in OVERRIDES) && AppOptions.get(name) === OVERRIDES[name]) {
continue;
}
AppOptions.set(name, prefs[name]); AppOptions.set(name, prefs[name]);
} }
} catch (reason) { } } catch (reason) { }

8
web/app_options.js
View file

@ -58,6 +58,9 @@ const defaultOptions = {
value: false, value: false,
kind: OptionKind.VIEWER, kind: OptionKind.VIEWER,
}, },
/**
* The `disablePreferences` is, conditionally, defined below.
*/
enablePrintAutoRotate: { enablePrintAutoRotate: {
/** @type {boolean} */ /** @type {boolean} */
value: false, value: false,
@ -218,6 +221,11 @@ const defaultOptions = {
}; };
if (typeof PDFJSDev === 'undefined' || if (typeof PDFJSDev === 'undefined' ||
PDFJSDev.test('!PRODUCTION || GENERIC')) { PDFJSDev.test('!PRODUCTION || GENERIC')) {
defaultOptions.disablePreferences = {
/** @type {boolean} */
value: false,
kind: OptionKind.VIEWER,
};
defaultOptions.locale = { defaultOptions.locale = {
/** @type {string} */ /** @type {string} */
value: (typeof navigator !== 'undefined' ? navigator.language : 'en-US'), value: (typeof navigator !== 'undefined' ? navigator.language : 'en-US'),