Merge pull request #16153 from calixteman/rm_base

Remove <base> tag from the Firefox built-in viewer (bug 1821408)
This commit is contained in:
calixteman 2023-03-14 10:40:15 +01:00 committed by GitHub
commit 945855a2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions

View File

@ -284,8 +284,11 @@ const defaultOptions = {
workerSrc: {
/** @type {string} */
value:
// eslint-disable-next-line no-nested-ternary
typeof PDFJSDev === "undefined" || !PDFJSDev.test("PRODUCTION")
? "../src/worker_loader.js"
: PDFJSDev.test("MOZCENTRAL")
? "resource://pdf.js/build/pdf.worker.js"
: "../build/pdf.worker.js",
kind: OptionKind.WORKER,
},

View File

@ -31,7 +31,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<!--#endif-->
<!--#if MOZCENTRAL-->
<!--<link rel="stylesheet" href="viewer.css">-->
<!--<link rel="stylesheet" href="resource://pdf.js/web/viewer.css">-->
<!--#else-->
<link rel="stylesheet" href="viewer-geckoview.css">
<!--#endif-->
@ -71,7 +71,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<script src="viewer-geckoview.js" type="module-shim"></script>
<!--#else-->
<!--<script src="viewer.js"></script>-->
<!--<script src="resource://pdf.js/web/viewer.js"></script>-->
<!--#endif-->
</head>

View File

@ -1,3 +1,2 @@
<!-- This snippet is used in the Firefox extension (included from viewer.html) -->
<base href="resource://pdf.js/web/">
<script src="../build/pdf.js"></script>
<script src="resource://pdf.js/build/pdf.js"></script>

View File

@ -36,7 +36,12 @@ See https://github.com/adobe-type-tools/cmap-resources
<!--#include viewer-snippet-chrome-extension.html-->
<!--#endif-->
<!--#if MOZCENTRAL-->
<!--<link rel="stylesheet" href="resource://pdf.js/web/viewer.css">-->
<!--#else-->
<link rel="stylesheet" href="viewer.css">
<!--#endif-->
<!--#if !PRODUCTION-->
<link rel="resource" type="application/l10n" href="locale/locale.properties">
<!--#endif-->
@ -77,10 +82,12 @@ See https://github.com/adobe-type-tools/cmap-resources
<!--#include viewer-snippet.html-->
<!--#endif-->
<!--#if !MINIFIED -->
<!--<script src="viewer.js"></script>-->
<!--#else-->
<!--#if MINIFIED-->
<!--#include viewer-snippet-minified.html-->
<!--#elif MOZCENTRAL-->
<!--<script src="resource://pdf.js/web/viewer.js"></script>-->
<!--#else-->
<!--<script src="viewer.js"></script>-->
<!--#endif-->
</head>