From abcc32ade08e2d0a1de70874038ad0db988f5c7e Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 17 Jun 2022 11:18:26 +0200 Subject: [PATCH] Simplify setting the `defaultUrl`-option in the CHROME viewer (PR 12470 follow-up) This should really have been done as part of PR 12470, since it's now possible to directly set the `defaultUrl`-option without having to fallback to `var`-usage. --- web/viewer.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/web/viewer.js b/web/viewer.js index 8acc7c8d4..72616c65b 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -27,14 +27,12 @@ window.PDFViewerApplication = PDFViewerApplication; window.PDFViewerApplicationOptions = AppOptions; if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME")) { - var defaultUrl; // eslint-disable-line no-var - (function rewriteUrlClosure() { // Run this code outside DOMContentLoaded to make sure that the URL // is rewritten as soon as possible. const queryString = document.location.search.slice(1); const m = /(^|&)file=([^&]*)/.exec(queryString); - defaultUrl = m ? decodeURIComponent(m[2]) : ""; + const defaultUrl = m ? decodeURIComponent(m[2]) : ""; // Example: chrome-extension://.../http://example.com/file.pdf const humanReadableUrl = "/" + defaultUrl + location.hash; @@ -43,6 +41,8 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME")) { // eslint-disable-next-line no-undef chrome.runtime.sendMessage("showPageAction"); } + + AppOptions.set("defaultUrl", defaultUrl); })(); } @@ -222,10 +222,6 @@ function webViewerLoad() { PDFViewerApplication.run(config); }); } else { - if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME")) { - AppOptions.set("defaultUrl", defaultUrl); - } - if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("GENERIC")) { // Give custom implementations of the default viewer a simpler way to // set various `AppOptions`, by dispatching an event once all viewer