From 923a9acb7f8c2efd17afa8e246d2067b41aaf298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Sat, 2 Nov 2019 16:21:11 +0100
Subject: [PATCH] Use Class.name for trueTypeOf comparison and only constructor
 name

---
 content/multipledataset.html | 4 ++--
 content/singledataset.html   | 8 ++++----
 static/js/data.js            | 4 ++--
 static/js/trueTypeOf.js      | 6 +-----
 static/js/websiteFile.js     | 4 ++--
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/content/multipledataset.html b/content/multipledataset.html
index 593e1ffd..4ac16b57 100644
--- a/content/multipledataset.html
+++ b/content/multipledataset.html
@@ -131,7 +131,7 @@ draft: false
         var td = $("<td/>", {
           style: "white-space: nowrap;"
         })
-        if (trueTypeOf(el) == "DOI") {
+        if (trueTypeOf(el) == DOI.name) {
           var publi = doiCache.get(el.string)
           $("<a/>", {
             href: el.url,
@@ -230,7 +230,7 @@ draft: false
         })
       for (const el of tableels) {
         td=$(tdtemp).clone()
-        if (trueTypeOf(el) == "DOI") {
+        if (trueTypeOf(el) == DOI.name) {
           var publi = doiCache.get(el.string)
           $("<a/>", {
             href: el.url,
diff --git a/content/singledataset.html b/content/singledataset.html
index 21e0ef9a..35ae62d0 100644
--- a/content/singledataset.html
+++ b/content/singledataset.html
@@ -96,10 +96,10 @@ draft: false
     $(sec).empty()
     for (const element of md) {
       switch (trueTypeOf(element)) {
-        case "string":
+        case String.name:
           $("<h2/>").text(element).appendTo(sec)
           break;
-        case "DOI":
+        case DOI.name:
           var publi = await Cite.async(element.string)
           var output = publi.format('bibliography', {
             format: 'html',
@@ -111,14 +111,14 @@ draft: false
             target: "_blank"
           }).html(output).appendTo(sec)
           break
-        case "websiteFile":
+        case websiteFile.name:
           $("<a/>", {
             href: element.url,
             target: "_blank",
             href: await element.getViewerURL()
           }).text("Go to file").appendTo(sec)
           break
-        case "Array":
+        case Array.name:
           k = element[0]
           v = element[1]
           k = k.charAt(0).toUpperCase() + k.slice(1)
diff --git a/static/js/data.js b/static/js/data.js
index ac429dce..b16b3bf3 100644
--- a/static/js/data.js
+++ b/static/js/data.js
@@ -112,11 +112,11 @@ class dataFileBase {
   }
   static async loadAsync(file) {
     switch (trueTypeOf(file)) {
-      case "string":
+      case String.name:
         file=getFullDataPath(file)
         var str=await getTextFromFileUrlAsync(file)
         break;
-      case "File":
+      case File.name:
         var str=await getTextFromUploadedFileAsync(file)
         break
     }
diff --git a/static/js/trueTypeOf.js b/static/js/trueTypeOf.js
index 1ba33d10..eeec8d19 100644
--- a/static/js/trueTypeOf.js
+++ b/static/js/trueTypeOf.js
@@ -1,7 +1,3 @@
 function trueTypeOf(object){
-  result=typeof object
-  if(result==typeof({})) {
-    result= object.constructor.name
-   }
-   return result
+  return object.constructor.name
 }
diff --git a/static/js/websiteFile.js b/static/js/websiteFile.js
index 626346d0..48ed5636 100644
--- a/static/js/websiteFile.js
+++ b/static/js/websiteFile.js
@@ -7,10 +7,10 @@ class websiteFile{
     var params=new URLSearchParams()
     var urlbase="/view"
     switch (trueTypeOf(this.file)) {
-      case "string":
+      case String.name:
         params.append("file",this.file)
         break
-      case "File":
+      case File.name:
         var base64=btoa(await getTextFromUploadedFileAsync(this.file))
         params.append("fileBase64",base64);
         break