From e20dabb65bf208d3d1a6bba23e2c28fdf8aaa2dd Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Fri, 3 Nov 2023 10:07:18 +0100
Subject: [PATCH] Simplify how the `docBaseUrl`-option is handled in
 `PDFViewerApplication.open`

Reduce the "special" handling a bit here, by setting the viewer-option such that it'll be automatically included in the API-parameters.
---
 web/app.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/app.js b/web/app.js
index 2f0018e81..cc464a8a4 100644
--- a/web/app.js
+++ b/web/app.js
@@ -1020,19 +1020,20 @@ const PDFViewerApplication = {
         /* downloadUrl = */ args.url
       );
     }
+    // Always set `docBaseUrl` in development mode, and in the (various)
+    // extension builds.
+    if (typeof PDFJSDev === "undefined") {
+      AppOptions.set("docBaseUrl", document.URL.split("#")[0]);
+    } else if (PDFJSDev.test("MOZCENTRAL || CHROME")) {
+      AppOptions.set("docBaseUrl", this.baseUrl);
+    }
+
     // Set the necessary API parameters, using all the available options.
     const apiParams = AppOptions.getAll(OptionKind.API);
-    const params = {
+    const loadingTask = getDocument({
       ...apiParams,
       ...args,
-    };
-
-    if (typeof PDFJSDev === "undefined") {
-      params.docBaseUrl ||= document.URL.split("#")[0];
-    } else if (PDFJSDev.test("MOZCENTRAL || CHROME")) {
-      params.docBaseUrl ||= this.baseUrl;
-    }
-    const loadingTask = getDocument(params);
+    });
     this.pdfLoadingTask = loadingTask;
 
     loadingTask.onPassword = (updateCallback, reason) => {