A change to #1098 to use the FileSaver library to modify and then wri…

…te the blob instead of using jsPDF to target Firefox 98+ only
thexerteproject · May 25, 2022 · b9dad63 · b9dad63
1 parent 0f27504
commit b9dad63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/jsPDF/FileSaver.min.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/jsPDF/FileSaver.min.js
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/results.html b/modules/xerte/parent_templates/Nottingham/models_html5/results.html
@@ -57,6 +57,7 @@
       filesToLoad = [
         'NotoSerif-Bold.js',
         'NotoSerif-Normal.js',
+        'FileSaver.min.js',
         'jspdf.min.js',
         'jspdf.plugin.autotable.min.js'
       ],
@@ -564,8 +565,12 @@
 
       // Workaround for Firefox/98.0 default opening issue
       let firefox = navigator.userAgent.indexOf("Firefox");
-      if (parseInt(navigator.userAgent.substr(firefox + 8, 4)) >= 98)
-        window.open(pdf.output("bloburl", { filename: name.replace(/ /g, "_") }));
+      if (parseInt(navigator.userAgent.substr(firefox + 8, 4)) >= 98) {
+          console.warn('Firefox 98+ detected - using alternative PDF save way...');
+          let blob = pdf.output('blob');
+          blob = blob.slice(0, blob.size, 'application/octet-stream');
+          saveAs(blob, name.replace(/ /g, "_"));
+      }
       else
         pdf.save(name.replace(/ /g, "_"));
     }