v4.0.0-alpha.3 - fix 'rowspan' logic

clarketm · Dec 7, 2016 · e6f8b84 · e6f8b84
1 parent aa98730
commit e6f8b84
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ $ npm install tableexport
 * [jQuery](https://jquery.com) (1.2.1 or higher) `*`
 * [FileSaver.js](https://github.com/clarketm/FileSaver.js/)
 
-> `*` jQuery dependency requirement is removed as of [4.0.0-alpha.2](https://github.com/clarketm/TableExport/tree/v4.0.0-alpha.2)
+> `*` jQuery dependency requirement is removed as of [4.0.0-alpha.3](https://github.com/clarketm/TableExport/tree/v4.0.0-alpha.3)
 
 #### Optional / Theming:
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport.js",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.3",
   "authors": [
     "clarketm <[email protected]>"
   ],

diff --git a/dist/css/tableexport.css b/dist/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js 4.0.0-alpha.2 (https://www.travismclarke.com)
+ * TableExport.js 4.0.0-alpha.3 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */

diff --git a/dist/css/tableexport.min.css b/dist/css/tableexport.min.css
diff --git a/dist/js/tableexport.js b/dist/js/tableexport.js
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js 4.0.0-alpha.2 (https://www.travismclarke.com)
+ * TableExport.js 4.0.0-alpha.3 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */
@@ -86,8 +86,14 @@
                                                 rcMap[ir + i][ic] = 1
                                             }
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat(val.textContent);
+                                        if (rcMap[ir]) {
+                                            var total = 0,
+                                                min = Math.min.apply(Math, Object.keys(rcMap[ir])),
+                                                max = Math.max.apply(Math, Object.keys(rcMap[ir]));
+                                            while (min < max && rcMap[ir][min]) {
+                                                total += rcMap[ir][min] && delete rcMap[ir][min++];
+                                            }
+                                            return new Array(total).concat(val.textContent);
                                         }
                                         return val.textContent;
                                     });
@@ -127,8 +133,14 @@
                                                 rcMap[ir + i][ic] = 1
                                             }
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat(val.textContent);
+                                        if (rcMap[ir]) {
+                                            var total = 0,
+                                                min = Math.min.apply(Math, Object.keys(rcMap[ir])),
+                                                max = Math.max.apply(Math, Object.keys(rcMap[ir]));
+                                            while (min < max && rcMap[ir][min]) {
+                                                total += rcMap[ir][min] && delete rcMap[ir][min++];
+                                            }
+                                            return new Array(total).concat(val.textContent);
                                         }
                                         return val.textContent;
                                     });
@@ -277,7 +289,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: "4.0.0-alpha.2",
+            version: "4.0.0-alpha.3",
             /**
              * Default plugin options.
              * @memberof TableExport.prototype

diff --git a/dist/js/tableexport.min.js b/dist/js/tableexport.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.3",
   "authors": [
     "clarketm <[email protected]>"
   ],

diff --git a/src/stable/css/tableexport.css b/src/stable/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js 4.0.0-alpha.2 (https://www.travismclarke.com)
+ * TableExport.js 4.0.0-alpha.3 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */

diff --git a/src/stable/css/tableexport.min.css b/src/stable/css/tableexport.min.css
diff --git a/src/stable/js/tableexport.js b/src/stable/js/tableexport.js
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js 4.0.0-alpha.2 (https://www.travismclarke.com)
+ * TableExport.js 4.0.0-alpha.3 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */
@@ -86,8 +86,14 @@
                                                 rcMap[ir + i][ic] = 1
                                             }
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat(val.textContent);
+                                        if (rcMap[ir]) {
+                                            var total = 0,
+                                                min = Math.min.apply(Math, Object.keys(rcMap[ir])),
+                                                max = Math.max.apply(Math, Object.keys(rcMap[ir]));
+                                            while (min < max && rcMap[ir][min]) {
+                                                total += rcMap[ir][min] && delete rcMap[ir][min++];
+                                            }
+                                            return new Array(total).concat(val.textContent);
                                         }
                                         return val.textContent;
                                     });
@@ -127,8 +133,14 @@
                                                 rcMap[ir + i][ic] = 1
                                             }
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat(val.textContent);
+                                        if (rcMap[ir]) {
+                                            var total = 0,
+                                                min = Math.min.apply(Math, Object.keys(rcMap[ir])),
+                                                max = Math.max.apply(Math, Object.keys(rcMap[ir]));
+                                            while (min < max && rcMap[ir][min]) {
+                                                total += rcMap[ir][min] && delete rcMap[ir][min++];
+                                            }
+                                            return new Array(total).concat(val.textContent);
                                         }
                                         return val.textContent;
                                     });
@@ -277,7 +289,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: "4.0.0-alpha.2",
+            version: "4.0.0-alpha.3",
             /**
              * Default plugin options.
              * @memberof TableExport.prototype

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