v5.0.0-rc.8 - fix: rowspan/colspan bug in XLSX format (from previous …

…commit)
clarketm · Jun 9, 2017 · aeb1b18 · aeb1b18
1 parent a9b6541
commit aeb1b18
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport.js",
-  "version": "5.0.0-rc.7",
+  "version": "5.0.0-rc.8",
   "authors": [
     "clarketm <[email protected]>"
   ],

diff --git a/dist/css/tableexport.css b/dist/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - 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.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - 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.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - Travis Clarke - https://www.travismclarke.com
  *
@@ -147,7 +147,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.0-rc.7',
+            version: '5.0.0-rc.8',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -888,7 +888,7 @@
 
         Array.prototype.processRows = function (key, rowDel) {
             if (_isEnhanced(key)) {
-                return this.filter(_defined);
+                return this.map(_toArray).filter(_defined);
             } else {
                 return this.filter(_defined).join(rowDel);
             }
@@ -974,7 +974,7 @@
         }
 
         function _toArray(val) {
-            return val && [].concat.apply([], val);
+            return val instanceof Array ? [].concat.apply([], val) : val;
         }
 
         function _isValidFormat(key) {

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.0-rc.7
+// Type definitions for TableExport v5.0.0-rc.8
 // Project: https://tableexport.v4.travismclarke.com
 // Definitions by: Travis Clarke <https://github.com/clarketm>
 
 /*!
- * TableExport.js v5.0.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - Travis Clarke - https://www.travismclarke.com
  *

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport",
-  "version": "5.0.0-rc.7",
+  "version": "5.0.0-rc.8",
   "authors": [
     "clarketm <[email protected]>"
   ],

diff --git a/src/stable/css/tableexport.css b/src/stable/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v5.0.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - 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.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - 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.0-rc.7 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.8 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - Travis Clarke - https://www.travismclarke.com
  *
@@ -147,7 +147,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.0-rc.7',
+            version: '5.0.0-rc.8',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -888,7 +888,7 @@
 
         Array.prototype.processRows = function (key, rowDel) {
             if (_isEnhanced(key)) {
-                return this.filter(_defined);
+                return this.map(_toArray).filter(_defined);
             } else {
                 return this.filter(_defined).join(rowDel);
             }
@@ -974,7 +974,7 @@
         }
 
         function _toArray(val) {
-            return val && [].concat.apply([], val);
+            return val instanceof Array ? [].concat.apply([], val) : val;
         }
 
         function _isValidFormat(key) {

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