Merge remote-tracking branch 'origin/dev_tw' into dev_tw

Wunderbyte-GmbH · Oct 13, 2023 · 9bf2bad · 9bf2bad
2 parents 5b47d40 + 2b5e6ad
commit 9bf2bad
Show file tree

Hide file tree

Showing 23 changed files with 517 additions and 82 deletions.
diff --git a/amd/build/pdf.min.js b/amd/build/pdf.min.js
diff --git a/amd/build/pdf.min.js.map b/amd/build/pdf.min.js.map
diff --git a/amd/build/pdf.worker.entry.min.js b/amd/build/pdf.worker.entry.min.js
diff --git a/amd/build/pdf.worker.entry.min.js.map b/amd/build/pdf.worker.entry.min.js.map
diff --git a/amd/build/pdf.worker.min.js b/amd/build/pdf.worker.min.js
diff --git a/amd/build/pdf.worker.min.js.map b/amd/build/pdf.worker.min.js.map
diff --git a/amd/build/pdf_backup.min.js b/amd/build/pdf_backup.min.js
diff --git a/amd/build/pdf_backup.min.js.map b/amd/build/pdf_backup.min.js.map
diff --git a/amd/build/pdfembed.min.js b/amd/build/pdfembed.min.js
diff --git a/amd/build/pdfembed.min.js.map b/amd/build/pdfembed.min.js.map
diff --git a/amd/src/._pdfembed.js b/amd/src/._pdfembed.js
diff --git a/amd/src/pdf.worker.entry.js b/amd/src/pdf.worker.entry.js
diff --git a/amd/src/pdf_backup.js b/amd/src/pdf_backup.js
diff --git a/amd/src/pdfembed.js b/amd/src/pdfembed.js
@@ -21,9 +21,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-import * as pdfjsLib from 'mod_datalynx/pdf';
-import * as pdfjsWorker from 'mod_datalynx/pdf.worker';
+// import * as pdfjsLib from 'mod_datalynx/pdf';
+// import * as pdfjsWorker from 'mod_datalynx/pdf.worker';
 
+// eslint-disable-next-line require-jsdoc
 function renderPDFfunction(url, canvasContainer) {
 
     function renderPage(page) {
@@ -73,9 +74,15 @@ function renderPDFfunction(url, canvasContainer) {
 
 }
 
-// eslint-disable-next-line require-jsdoc
+/**
+ *
+ * @param {*} pdfUrl
+ * @param {*} canvasContainerId
+ */
 export function renderPDF(pdfUrl, canvasContainerId) {
 
+    console.log(pdfUrl, canvasContainerId);
+
     // eslint-disable-next-line no-unused-vars
     const pdf = M.cfg.wwwroot + '/mod/datalynx/tests/turnen.pdf';
     const container = document.querySelector(`#${canvasContainerId}`);

diff --git a/field/file/renderer.php b/field/file/renderer.php
@@ -201,14 +201,17 @@ protected function embed_pdf(string $fullurl, string $fieldname): string {
         global $PAGE;
         $PAGE->requires->js_call_amd('mod_datalynx/pdfembed', 'renderPDF',
                 [$fullurl, $fieldname]);
+
+        $a = html_writer::tag('script', '', [
+            'src' => 'pdfjs/pdf.js']);
+        $b = html_writer::tag('script', '', [
+                'src' => 'pdfjs/pdf.worker.js']);
+
         return '<div><a href="' . $fullurl . '" target="_blank" class="btn btn-primary">' .
                 get_string('download', 'core_repository') . ' ' .
                 get_string('application/pdf', 'core_mimetypes') .  '</a></div><br>
         <div style="width: 800px; min-height: 400px;" id="' . $fieldname . '"></div>
-        ';
-
-        // the size is hardcoded in the boject obove intentionally because it is adjusted by the following function on-the-fly
-        // $PAGE->requires->js_call_amd('mod_datalynx/maximiseembed', 'initMaximisedEmbed', ['resourceembed']);
+        ' . $a . $b;
     }
 
     /**