Remove a couple of unnecessary PDFJSDev checks from the viewer

- Given the `DefaultExternalServices` implementation, the `PDFViewerApplication.supportsDocumentFonts` getter is guaranteed to be defined and we can thus remove some (now) unnecessary `PDFJSDev` checks from the `webViewerInitialized` function.
 - By slightly tweaking the "pdfBugEnabled" definition in `web/app_options`, similar to the existing ones for "workerSrc" and "cMapUrl", we can remove some `PDFJSDev` checks from the `PDFViewerApplication._parseHashParameters` method.
This commit is contained in:
Jonas Jenwald 2020-07-23 18:06:02 +02:00
parent d69fb446bf
commit 1c809c87af
2 changed files with 3 additions and 11 deletions

View File

@ -299,11 +299,7 @@ const PDFViewerApplication = {
* @private * @private
*/ */
async _parseHashParameters() { async _parseHashParameters() {
if ( if (!AppOptions.get("pdfBugEnabled")) {
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("PRODUCTION") &&
!AppOptions.get("pdfBugEnabled")
) {
return undefined; return undefined;
} }
const hash = document.location.hash.substring(1); const hash = document.location.hash.substring(1);
@ -1931,11 +1927,7 @@ function webViewerInitialized() {
appConfig.secondaryToolbar.openFileButton.setAttribute("hidden", "true"); appConfig.secondaryToolbar.openFileButton.setAttribute("hidden", "true");
} }
if ( if (!PDFViewerApplication.supportsDocumentFonts) {
(typeof PDFJSDev === "undefined" ||
PDFJSDev.test("MOZCENTRAL || GENERIC")) &&
!PDFViewerApplication.supportsDocumentFonts
) {
AppOptions.set("disableFontFace", true); AppOptions.set("disableFontFace", true);
PDFViewerApplication.l10n PDFViewerApplication.l10n
.get( .get(

View File

@ -112,7 +112,7 @@ const defaultOptions = {
}, },
pdfBugEnabled: { pdfBugEnabled: {
/** @type {boolean} */ /** @type {boolean} */
value: false, value: typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION"),
kind: OptionKind.VIEWER + OptionKind.PREFERENCE, kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
}, },
printResolution: { printResolution: {