fixed filname checking in export class

LCluber · Apr 10, 2019 · 5e4e1b2 · 5e4e1b2
1 parent dc5d871
commit 5e4e1b2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version 0.1.10 (April 10th 2019)
+-----------------------------
+ * fixed csv export with better filename checking
+
 Version 0.1.9 (April 09th 2019)
 -----------------------------
  * fixed csv export with special characters

diff --git a/dist/csvx.iife.js b/dist/csvx.iife.js
@@ -972,7 +972,7 @@ var CSVx = (function (exports) {
         return false;
       }
 
-      if (!filename.trim().length) {
+      if (!filename) {
         filename = 'export';
       }
 
@@ -992,7 +992,7 @@ var CSVx = (function (exports) {
         this.log.info(filename + ' labels ready');
       }
 
-      table += encodeURIComponent(this.createTable(_data));
+      table += this.createTable(_data);
       this.log.info(filename + ' table ready');
       this.download(table, filename);
       return true;
@@ -1050,7 +1050,7 @@ var CSVx = (function (exports) {
         table += this.createRow(parsedRow);
       }
 
-      return table;
+      return encodeURIComponent(table);
     };
 
     Export.createLabels = function createLabels(data) {

diff --git a/dist/csvx.iife.min.js b/dist/csvx.iife.min.js
diff --git a/dist/csvx.js b/dist/csvx.js
@@ -32,7 +32,7 @@ class Export {
         if (!Is.object(data[0]) && !Is.json(data[0])) {
             return false;
         }
-        if (!filename.trim().length) {
+        if (!filename) {
             filename = 'export';
         }
         if (options) {
@@ -48,7 +48,7 @@ class Export {
             }
             this.log.info(filename + ' labels ready');
         }
-        table += encodeURIComponent(this.createTable(data));
+        table += this.createTable(data);
         this.log.info(filename + ' table ready');
         this.download(table, filename);
         return true;
@@ -82,7 +82,7 @@ class Export {
             }
             table += this.createRow(parsedRow);
         }
-        return table;
+        return encodeURIComponent(table);
     }
     static createLabels(data) {
         let labels = Is.json(data[0]) || data[0];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lcluber/csvxjs",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "CSV Export library written in TypeScript.",
   "keywords": [],
   "homepage": "http://csvxjs.lcluber.com",

diff --git a/src/ts/export.ts b/src/ts/export.ts
@@ -24,7 +24,7 @@ export class Export {
     if (!Is.object(data[0]) && !Is.json(data[0])) {
       return false;
     }
-    if (!filename.trim().length) {
+    if (!filename) {
       filename = 'export';
     }
     if (options) {
@@ -39,7 +39,7 @@ export class Export {
       }
       this.log.info(filename + ' labels ready');
     }
-    table += encodeURIComponent(this.createTable(data));
+    table += this.createTable(data);
     this.log.info(filename + ' table ready');
     this.download(table, filename);
     return true;
@@ -76,7 +76,7 @@ export class Export {
       }
       table += this.createRow(parsedRow);
     }
-    return table;
+    return encodeURIComponent(table);
   }
 
   private static createLabels( data: Object[]|string[] ): string {