v3.3.7 - improve 'rowspan' logic

clarketm · Dec 7, 2016 · 87824df · 87824df
1 parent 3beefbd
commit 87824df
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 34 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport.js",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "authors": [
     "clarketm <[email protected]>"
   ],

diff --git a/dist/css/tableexport.css b/dist/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v3.3.6 (https://www.travismclarke.com)
+ * TableExport.js v3.3.7 (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 v3.3.6 (https://www.travismclarke.com)
+ * TableExport.js v3.3.7 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */
@@ -88,11 +88,15 @@
                                             }
                                         }
                                         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++];
+                                            var threshold = ic + 1,
+                                                total = 0,
+                                                count = 0;
+
+                                            for (var i = 0; i <= Math.max.apply(Math, Object.keys(rcMap[ir])); i++) {
+                                                (!rcMap[ir][i]) ? count++ : total = count >= ic ? total + rcMap[ir][i] : total;
+                                                if (count === threshold) {
+                                                    break;
+                                                }
                                             }
                                             return new Array(total).concat($(val).text());
                                         }
@@ -135,11 +139,15 @@
                                             }
                                         }
                                         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++];
+                                            var threshold = ic + 1,
+                                                total = 0,
+                                                count = 0;
+
+                                            for (var i = 0; i <= Math.max.apply(Math, Object.keys(rcMap[ir])); i++) {
+                                                (!rcMap[ir][i]) ? count++ : total = count >= ic ? total + rcMap[ir][i] : total;
+                                                if (count === threshold) {
+                                                    break;
+                                                }
                                             }
                                             return new Array(total).concat($(val).text());
                                         }
@@ -282,7 +290,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: "3.3.6",
+            version: "3.3.7",
             /**
              * 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": "3.3.6",
+  "version": "3.3.7",
   "authors": [
     "clarketm <[email protected]>"
   ],

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