From 16b07ae25c619e5ba9ddaf7ec1e93444d77ca48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Wed, 29 Jan 2020 11:56:38 +0100
Subject: [PATCH] Use the FileSaver library to download

---
 content/view.html         | 11 ++++++-----
 static/js/downloadData.js | 11 -----------
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 static/js/downloadData.js

diff --git a/content/view.html b/content/view.html
index f88cbf0f..e9ec36ed 100644
--- a/content/view.html
+++ b/content/view.html
@@ -5,7 +5,7 @@ draft: false
 ---
 <script src="/js/getFullDataPath.js" type="text/javascript"></script>
 <script src="/js/getTextFromFile.js" type="text/javascript"></script>
-<script src="/js/downloadData.js" type="text/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.2/dist/FileSaver.min.js"></script>
 <script src="/js/Base64ToBlob.js" type="text/javascript"></script>
 <script>
 
@@ -28,12 +28,13 @@ draft: false
     var key = ["file", "fileBase64"]
     if (params.has(key[0])) {
       var filename = params.get(key[0]);
-      var textPromise = getTextFromFileUrlAsync(filename)
+      var text = await getTextFromFileUrlAsync(filename)
       $("#btn_download").click(function () {
-        window.open(filename, "_self");
+        var b = new Blob([text],{type:"text/plain;charset=utf-8"});
+        saveAs(b, filename.substring(filename.lastIndexOf('/')+1))
       })
       $('#fileTitle').text(filename);
-      $('#fileContent').text(await textPromise)
+      $('#fileContent').text(text)
       $('#file').show();
       $("#div_btn").show();
 
@@ -41,7 +42,7 @@ draft: false
       var base64 = params.get(key[1]);
       $("#btn_download").click(function () {
         const blob = base64ToBlob(base64, "text/plain")
-        downloadData(blob, "file.dat")
+        saveAs(b, "file.dat")
       })
       $('#fileTitle').hide()
       $('#fileContent').text(atob(base64))
diff --git a/static/js/downloadData.js b/static/js/downloadData.js
deleted file mode 100644
index d6be9842..00000000
--- a/static/js/downloadData.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function downloadData(data,fileName) {
-  const url=window.URL.createObjectURL(data)
-  const a = document.createElement('a');
-  a.style.display = 'none';
-  a.href = url;
-  a.download = fileName;
-  document.body.appendChild(a);
-  a.click();
-  window.URL.revokeObjectURL(url);
-  document.body.removeChild(a)
-}