Skip to content

Commit

Permalink
Remove <base> tag from the Firefox built-in viewer (bug 1821408)
Browse files Browse the repository at this point in the history
The tag <base> is used to resolve relative URIs within the document.
Newly added SVG filters use a relative URI which then use the URI in base
but this one mismatches with the document URI and consequently filters are
not found in the Firefox viewer.
So this patch just removes <base> and replace few relative URLs by absolute
ones.
  • Loading branch information
calixteman committed Mar 14, 2023
1 parent 351d11c commit ea1d090
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
3 changes: 3 additions & 0 deletions web/app_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
4 changes: 2 additions & 2 deletions web/viewer-geckoview.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!--#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-->
Expand Down Expand Up @@ -71,7 +71,7 @@

<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>
Expand Down
3 changes: 1 addition & 2 deletions web/viewer-snippet-firefox-extension.html
Original file line number Diff line number Diff line change
@@ -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>
13 changes: 10 additions & 3 deletions web/viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
<!--#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-->
Expand Down Expand Up @@ -77,10 +82,12 @@
<!--#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>
Expand Down

0 comments on commit ea1d090

Please sign in to comment.