From f5d2df9811427da9f076d75a830c1066a3d1220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Wed, 30 Oct 2019 13:28:32 +0100
Subject: [PATCH] Use URLSearchParams API instead of manual or
 parseQueryStringToDictionary use

---
 content/view.html                         | 12 ++++-----
 static/js/parseQueryStringToDictionary.js | 31 -----------------------
 static/js/websiteFile.js                  | 12 +++++++--
 3 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 static/js/parseQueryStringToDictionary.js

diff --git a/content/view.html b/content/view.html
index 0da6394a..586beabd 100644
--- a/content/view.html
+++ b/content/view.html
@@ -5,7 +5,6 @@ draft: false
 ---
       <script src="/js/getFullDataPath.js" type="text/javascript"></script>
       <script src="/js/getTextFromFile.js" type="text/javascript"></script>
-      <script src="/js/parseQueryStringToDictionary.js" type="text/javascript"></script>
     <script>
 
       window.onload=async function(){
@@ -23,10 +22,10 @@ draft: false
         }
         console.warn(mystr);
       }
-      var queryDic=parseQueryStringToDictionary()
+      var params=new URL(window.location.href).searchParams
       var key=["file","fileBase64"]
-      if(key[0] in queryDic){
-        var filename=queryDic[key[0]];
+      if(params.has(key[0])){
+        var filename=params.get(key[0]);
         var textPromise=getTextFromFileUrlAsync(filename) 
         $("#btn_download").click(function(){
           window.open(filename,"_self");
@@ -35,8 +34,9 @@ draft: false
         document.getElementById('fileContent').innerText=await textPromise;
         document.getElementById('file').hidden=false;
         document.getElementById("div_btn").hidden=false;
-      } else if(key[1] in queryDic){
-        var base64=queryDic[key[1]];
+
+      } else if(params.has(key[1])){
+        var base64=params.get(key[1]);
         $("#btn_download").click(function(){
           window.open(String.raw`data:text/plain;base64,${base64}`,"_self")
         })
diff --git a/static/js/parseQueryStringToDictionary.js b/static/js/parseQueryStringToDictionary.js
deleted file mode 100644
index 8fcce9b6..00000000
--- a/static/js/parseQueryStringToDictionary.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function parseQueryStringToDictionary(queryString=window.location.search) {
-  var dictionary = {};
-
-  // remove the '?' from the beginning of the
-  // if it exists
-  if (queryString.indexOf('?') === 0) {
-    queryString = queryString.substr(1);
-  }
-
-  // Step 1: separate out each key/value pair
-  var parts = queryString.split('&amp;');
-
-  for (var i = 0; i < parts.length; i++) {
-    var p = parts[i];
-    // Step 2: Split Key/Value pair
-    var keyValuePair = p.split('=');
-
-    // Step 3: Add Key/Value pair to Dictionary object
-    var key = keyValuePair[0];
-    var value = keyValuePair[1];
-
-    // decode URI encoded string
-    value = decodeURIComponent(value);
-    value = value.replace(/\+/g, ' ');
-
-    dictionary[key] = value;
-  }
-
-  // Step 4: Return Dictionary Object
-  return dictionary;
-}
diff --git a/static/js/websiteFile.js b/static/js/websiteFile.js
index 1822327a..0673e211 100644
--- a/static/js/websiteFile.js
+++ b/static/js/websiteFile.js
@@ -4,15 +4,23 @@ class websiteFile{
   }
 
   async getViewerURL(){
+    params=new URLSearchParams()
     var urlbase="/view"
     switch (trueTypeOf(this.file)) {
       case "string":
-        return String.raw`${urlbase}?file=${this.file}`
+        params.append("file",this.file)
         break
       case "File":
         var base64=btoa(await getTextFromUploadedFileAsync(this.file))
-        return String.raw`${urlbase}?fileBase64=${base64}`;
+        params.append("fileBase64",base64);
         break
     }
+    if ([...params].length>0){
+      return urlbase+"?"+params.tostring()
+    }
+    else{
+      return urlbase   
+    }
+      
   }
 }
\ No newline at end of file