v5.0.4 - fix issue with xlsx on mobile, closes #156, closes #131

clarketm · Nov 22, 2018 · c1e023e · c1e023e
1 parent 774d9b0
commit c1e023e
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -40,9 +40,9 @@ $ npm install tableexport
 #### [CDNjs](https://cdnjs.com/libraries/TableExport)
 |          | uncompressed | compressed |
 | :------: | :----------: | :--------: |
-|  __CSS__ |   [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/css/tableexport.css)     |  [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/css/tableexport.min.css)      |
-|  __JS__  |   [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/js/tableexport.js)     |  [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/js/tableexport.min.js)      |
-|  __Images__  | &mdash; |   [🔗<sup>xlsx</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/img/xlsx.svg)[🔗<sup>xls</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/img/xls.svg)[🔗<sup>csv</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/img/csv.svg)[🔗<sup>txt</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.3/img/txt.svg)  |
+|  __CSS__ |   [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/css/tableexport.css)     |  [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/css/tableexport.min.css)      |
+|  __JS__  |   [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/js/tableexport.js)     |  [🔗](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/js/tableexport.min.js)      |
+|  __Images__  | &mdash; |   [🔗<sup>xlsx</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/img/xlsx.svg)[🔗<sup>xls</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/img/xls.svg)[🔗<sup>csv</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/img/csv.svg)[🔗<sup>txt</sup>](https://cdnjs.cloudflare.com/ajax/libs/TableExport/5.0.4/img/txt.svg)  |
 
 
 #### [unpkg](https://unpkg.com/#/)

diff --git a/dist/css/tableexport.css b/dist/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *

diff --git a/dist/css/tableexport.min.css b/dist/css/tableexport.min.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *

diff --git a/dist/js/tableexport.js b/dist/js/tableexport.js
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *
@@ -148,7 +148,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.3',
+            version: '5.0.4',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -568,10 +568,10 @@
              * @param merges {Object[]}
              */
             export2file: function (data, mime, name, extension, merges) {
+                var format = extension.slice(1);
                 data = this.getRawData(data, extension, name, merges);
 
-                if (_isMobile) {
-                    // TODO: fix dataURI on iphone (xlsx & xls)
+                if (_isMobile && (format === _FORMAT.CSV || format === _FORMAT.TXT)) {
                     var dataURI = 'data:' + mime + ';' + this.charset + ',' + data;
                     this.downloadDataURI(dataURI, name, extension);
                 } else {
@@ -942,7 +942,6 @@
             return function (key) {
                 return (
                     XLSX
-                    && !_isMobile
                     && !(TableExport.prototype.formatConfig[key].enforceStrictRFC4180)
                 );
             }

diff --git a/dist/js/tableexport.min.js b/dist/js/tableexport.min.js
diff --git a/dist/tableexport.d.ts b/dist/tableexport.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for TableExport v5.0.3
+// Type definitions for TableExport v5.0.4
 // Project: https://tableexport.travismclarke.com
 // Definitions by: Travis Clarke <https://github.com/clarketm>
 
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *
@@ -261,5 +261,5 @@ declare global {
          */
         tableExport(options?: Defaults): TableExport;
     }
-    
-}
+
+}
diff --git a/docs b/docs
diff --git a/src/stable/css/tableexport.css b/src/stable/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *

diff --git a/src/stable/css/tableexport.min.css b/src/stable/css/tableexport.min.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *

diff --git a/src/stable/js/tableexport.js b/src/stable/js/tableexport.js
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.3 (https://www.travismclarke.com)
+ * TableExport.js v5.0.4 (https://www.travismclarke.com)
  *
  * Copyright (c) 2018 - Travis Clarke - https://www.travismclarke.com
  *
@@ -148,7 +148,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.3',
+            version: '5.0.4',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -568,10 +568,10 @@
              * @param merges {Object[]}
              */
             export2file: function (data, mime, name, extension, merges) {
+                var format = extension.slice(1);
                 data = this.getRawData(data, extension, name, merges);
 
-                if (_isMobile) {
-                    // TODO: fix dataURI on iphone (xlsx & xls)
+                if (_isMobile && (format === _FORMAT.CSV || format === _FORMAT.TXT)) {
                     var dataURI = 'data:' + mime + ';' + this.charset + ',' + data;
                     this.downloadDataURI(dataURI, name, extension);
                 } else {
@@ -942,7 +942,6 @@
             return function (key) {
                 return (
                     XLSX
-                    && !_isMobile
                     && !(TableExport.prototype.formatConfig[key].enforceStrictRFC4180)
                 );
             }

diff --git a/src/stable/js/tableexport.min.js b/src/stable/js/tableexport.min.js