From 1d4be9b05f2a4468dbbd1c492e2fdde92995b5e6 Mon Sep 17 00:00:00 2001
From: Yassine Chaouche <yacinechaouche@yahoo.com>
Date: Wed, 21 Dec 2016 11:28:48 +0100
Subject: [PATCH 1/4] Added "type" attributes to script tags

 fixing #29
---
 index.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 4fd9b2dd..fa0eff90 100644
--- a/index.html
+++ b/index.html
@@ -15,8 +15,8 @@
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+      <script type="text/javascript" src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script type="text/javascript" src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -43,14 +43,15 @@ <h2>CSV to HTML Table</h2>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="js/jquery.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-    <script src="js/jquery.csv.min.js"></script>
-    <script src="js/jquery.dataTables.min.js"></script>
-    <script src="js/dataTables.bootstrap.js"></script>
-    <script src='js/csv_to_html_table.js'></script>
+    <script type="text/javascript" src="js/jquery.min.js"></script>
+    <script type="text/javascript" src="js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="js/jquery.csv.js"></script>
+    <script type="text/javascript" src="js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="js/dataTables.bootstrap.js"></script>
+    <script type="text/javascript" src="js/csv_to_html_table.js"></script>
 
-    <script>
+
+    <script type="text/javascript">
       function format_link(link){
         if (link)
           return "<a href='" + link + "' target='_blank'>" + link + "</a>";
@@ -59,10 +60,11 @@ <h2>CSV to HTML Table</h2>
       }
 
       CsvToHtmlTable.init({
-        csv_path: 'data/Health Clinics in Chicago.csv', 
+        csv_path: 'data/mail.csv', 
         element: 'table-container', 
         allow_download: true,
-        csv_options: {separator: ',', delimiter: '"'},
+        //csv_options: {separator: ',', delimiter: '"'},
+        csv_options: {separator: ',', delimiter:"`"},
         datatables_options: {"paging": false},
         custom_formatting: [[4, format_link]]
       });

From 40f2c5907443b8491f8ecb4c6c377957e22bb077 Mon Sep 17 00:00:00 2001
From: Yassine Chaouche <yacinechaouche@yahoo.com>
Date: Wed, 21 Dec 2016 11:32:52 +0100
Subject: [PATCH 2/4] Update index.html

---
 index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index fa0eff90..2174b869 100644
--- a/index.html
+++ b/index.html
@@ -45,7 +45,7 @@ <h2>CSV to HTML Table</h2>
     <!-- Placed at the end of the document so the pages load faster -->
     <script type="text/javascript" src="js/jquery.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="js/jquery.csv.js"></script>
+    <script type="text/javascript" src="js/jquery.csv.min.js"></script>
     <script type="text/javascript" src="js/jquery.dataTables.min.js"></script>
     <script type="text/javascript" src="js/dataTables.bootstrap.js"></script>
     <script type="text/javascript" src="js/csv_to_html_table.js"></script>
@@ -60,11 +60,10 @@ <h2>CSV to HTML Table</h2>
       }
 
       CsvToHtmlTable.init({
-        csv_path: 'data/mail.csv', 
+        csv_path: 'data/Health Clinics in Chicago.csv',
         element: 'table-container', 
         allow_download: true,
-        //csv_options: {separator: ',', delimiter: '"'},
-        csv_options: {separator: ',', delimiter:"`"},
+        csv_options: {separator: ',', delimiter: '"'},
         datatables_options: {"paging": false},
         custom_formatting: [[4, format_link]]
       });

From 69c98d3f782529e2f861da606bb8bc8accc42d0d Mon Sep 17 00:00:00 2001
From: Yassine Chaouche <yacinechaouche@yahoo.com>
Date: Wed, 21 Dec 2016 14:47:02 +0100
Subject: [PATCH 3/4] HTML escaping

Some CSV files contain nasty things like "<" and ">" which corrupt the rendering of the table. This double for loop cleans the csv_data array before rendering the table.
---
 js/csv_to_html_table.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/csv_to_html_table.js b/js/csv_to_html_table.js
index 3af5454a..5a3fe0c5 100644
--- a/js/csv_to_html_table.js
+++ b/js/csv_to_html_table.js
@@ -16,7 +16,12 @@ CsvToHtmlTable = {
       $.when($.get(csv_path)).then(
         function(data){      
           var csv_data = $.csv.toArrays(data, csv_options);
-
+          // escape nasty HTML entities
+          for (i=0;i<csv_data.length;i++){
+              for(j=0;j<csv_data[i].length;j++){
+              csv_data[i][j] = $("<div>").text(csv_data[i][j]).html();
+              }
+          }
           var table_head = "<thead><tr>";
 
           for (head_id = 0; head_id < csv_data[0].length; head_id++) { 
@@ -53,4 +58,4 @@ CsvToHtmlTable = {
             $("#" + el).append("<p><a class='btn btn-info' href='" + csv_path + "'><i class='glyphicon glyphicon-download'></i> Download as CSV</a></p>");
         });
     }
-}
\ No newline at end of file
+}

From f70525c2b41aff9e5725b92a8fb493f4af299314 Mon Sep 17 00:00:00 2001
From: Derek Eder <derek.eder@gmail.com>
Date: Tue, 17 Jan 2017 15:00:43 -0600
Subject: [PATCH 4/4] removed html escape block

---
 js/csv_to_html_table.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/js/csv_to_html_table.js b/js/csv_to_html_table.js
index 5a3fe0c5..6550d974 100644
--- a/js/csv_to_html_table.js
+++ b/js/csv_to_html_table.js
@@ -16,12 +16,7 @@ CsvToHtmlTable = {
       $.when($.get(csv_path)).then(
         function(data){      
           var csv_data = $.csv.toArrays(data, csv_options);
-          // escape nasty HTML entities
-          for (i=0;i<csv_data.length;i++){
-              for(j=0;j<csv_data[i].length;j++){
-              csv_data[i][j] = $("<div>").text(csv_data[i][j]).html();
-              }
-          }
+          
           var table_head = "<thead><tr>";
 
           for (head_id = 0; head_id < csv_data[0].length; head_id++) {