From bb25b6dec5b5b7919ebfccd86939f8b10b45d78f Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Thu, 7 Apr 2022 16:20:41 +0200
Subject: [PATCH] Use a bit more optional chaining in the viewer
---
web/app.js | 10 ++++------
web/viewer.js | 4 +---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/web/app.js b/web/app.js
index 490528066..bac696b45 100644
--- a/web/app.js
+++ b/web/app.js
@@ -2047,9 +2047,8 @@ const PDFViewerApplication = {
* @private
*/
_unblockDocumentLoadEvent() {
- if (document.blockUnblockOnload) {
- document.blockUnblockOnload(false);
- }
+ document.blockUnblockOnload?.(false);
+
// Ensure that this method is only ever run once.
this._unblockDocumentLoadEvent = () => {};
},
@@ -2112,9 +2111,8 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
}
async function loadFakeWorker() {
- if (!GlobalWorkerOptions.workerSrc) {
- GlobalWorkerOptions.workerSrc = AppOptions.get("workerSrc");
- }
+ GlobalWorkerOptions.workerSrc ||= AppOptions.get("workerSrc");
+
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")) {
window.pdfjsWorker = await import("pdfjs/core/worker.js");
return;
diff --git a/web/viewer.js b/web/viewer.js
index 6bc8b2ab7..de053070f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -243,9 +243,7 @@ function webViewerLoad() {
// Block the "load" event until all pages are loaded, to ensure that printing
// works in Firefox; see https://bugzilla.mozilla.org/show_bug.cgi?id=1618553
-if (document.blockUnblockOnload) {
- document.blockUnblockOnload(true);
-}
+document.blockUnblockOnload?.(true);
if (
document.readyState === "interactive" ||