From c777a4b518ebbace20058f1a2c0e7db890dc6ba0 Mon Sep 17 00:00:00 2001
From: sysadminstory <sysadminstory@users.noreply.github.com>
Date: Thu, 27 Jan 2022 23:56:57 +0100
Subject: [PATCH] Change to make work PDF reader using a cusomer app folder

Move the loading of the 'pdf.worker.js' file from ready.js to pdfreader.php
---
 js/ready.js             | 3 ++-
 templates/pdfreader.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/ready.js b/js/ready.js
index 721c1df..421279d 100644
--- a/js/ready.js
+++ b/js/ready.js
@@ -145,7 +145,8 @@ document.onreadystatechange = function () {
     function renderPdf(file, options) {
         PDFJS.filePath = "vendor/pdfjs/";
         PDFJS.imageResourcesPath = "vendor/pdfjs/css/images/";
-        PDFJS.workerSrc = options.session.basePath + 'vendor/pdfjs/lib/pdf.worker.js';
+        // This file is loaded using the HTML template instead
+		// PDFJS.workerSrc = options.session.basePath + 'vendor/pdfjs/lib/pdf.worker.js';
 
         var reader = pdfReader(file, options);
     }
diff --git a/templates/pdfreader.php b/templates/pdfreader.php
index 5e7bf20..4de36d8 100644
--- a/templates/pdfreader.php
+++ b/templates/pdfreader.php
@@ -43,6 +43,7 @@
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/text_layer_builder.css')) ?>?v=<?php p($version) ?>">
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/css/annotation_layer_builder.css')) ?>?v=<?php p($version) ?>">
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script>
+		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/pdfjs/lib/pdf.worker.js')) ?>?v=<?php p($version) ?>"> </script>
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/bartaz/jquery.highlight.js')) ?>?v=<?php p($version) ?>"> </script>
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/jquery/put-delete.js')) ?>?v=<?php p($version) ?>"> </script>
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('epubreader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script>