Merge pull request #1114 from nextcloud/backport/1106/stable28

[stable28] Fix path to image resources
nextcloud · Jan 17, 2025 · 55511d1 · 55511d1
2 parents 4a85f2b + f2abfa3
commit 55511d1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/js/files_pdfviewer-workersrc.js b/js/files_pdfviewer-workersrc.js
diff --git a/js/files_pdfviewer-workersrc.js.map b/js/files_pdfviewer-workersrc.js.map
diff --git a/src/workersrc.js b/src/workersrc.js
@@ -46,7 +46,7 @@ function initializeCustomPDFViewerApplication() {
 	PDFViewerApplicationOptions.set('cMapUrl', head.getAttribute('data-cmapurl'))
 	PDFViewerApplicationOptions.set('sandboxBundleSrc', head.getAttribute('data-sandbox'))
 	PDFViewerApplicationOptions.set('enablePermissions', true)
-	PDFViewerApplicationOptions.set('imageResourcesPath', './js/pdfjs/web/images/')
+	PDFViewerApplicationOptions.set('imageResourcesPath', head.getAttribute('data-imageresourcespath'))
 	PDFViewerApplicationOptions.set('enableScripting', head.getAttribute('data-enableScripting') === true)
 
 	if (hideDownload === '1') {

diff --git a/templates/viewer.php b/templates/viewer.php
@@ -35,7 +35,8 @@
   <head data-workersrc="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/build/pdf.worker.js')) ?>?v=<?php p($version) ?>"
         data-enableScripting="<?php p($enableScripting ? true : false) ?>"
         data-sandbox="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/build/pdf.sandbox.js'))?>"
-        data-cmapurl="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/web/cmaps/')) ?>">
+        data-cmapurl="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/web/cmaps/')) ?>"
+        data-imageresourcespath="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/web/images/')) ?>">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="google" content="notranslate">