v3.2.10 – fixed issue with consecutive rowspan/colspan being ignored

clarketm · Sep 9, 2016 · e9a56a1 · e9a56a1
1 parent 0e77b2c
commit e9a56a1
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport.js",
-  "version": "3.2.9",
+  "version": "3.2.10",
   "authors": [
     "clarketm <travis.m.clarke@gmail.com>"
   ],

diff --git a/dist/css/tableexport.css b/dist/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v3.2.9 (https://www.travismclarke.com)
+ * TableExport.js v3.2.10 (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.2.9 (https://www.travismclarke.com)
+ * TableExport.js v3.2.10 (https://www.travismclarke.com)
  * Copyright 2016 Travis Clarke
  * Licensed under the MIT license
  */
@@ -74,9 +74,6 @@
                                         if (!!~ignoreCols.indexOf(ic) || $(val).is(ignoreCSS)) {
                                             return;
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat($(val).text());
-                                        }
                                         if (val.hasAttribute('colspan')) {
                                             rcMap[ir] = rcMap[ir] || {};
                                             rcMap[ir][ic+1] = val.getAttribute('colspan') - 1
@@ -87,6 +84,9 @@
                                                 rcMap[ir+i][ic] = 1
                                             }
                                         }
+                                        if (rcMap[ir] && rcMap[ir][ic]) {
+                                            return new Array(rcMap[ir][ic]).concat($(val).text());
+                                        }
                                         return $(val).text();
                                     }).get()];
                                 }).get(),
@@ -112,9 +112,6 @@
                                         if (!!~ignoreCols.indexOf(ic) || $(val).is(ignoreCSS)) {
                                             return;
                                         }
-                                        if (rcMap[ir] && rcMap[ir][ic]) {
-                                            return new Array(rcMap[ir][ic]).concat($(val).text());
-                                        }
                                         if (val.hasAttribute('colspan')) {
                                             rcMap[ir] = rcMap[ir] || {};
                                             rcMap[ir][ic+1] = val.getAttribute('colspan') - 1
@@ -125,6 +122,9 @@
                                                 rcMap[ir+i][ic] = 1
                                             }
                                         }
+                                        if (rcMap[ir] && rcMap[ir][ic]) {
+                                            return new Array(rcMap[ir][ic]).concat($(val).text());
+                                        }
                                         return $(val).text();
                                     }).get()];
                                 }).get(),

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.2.9",
+  "version": "3.2.10",
   "authors": [
     "clarketm <travis.m.clarke@gmail.com>"
   ],

diff --git a/src/stable/css/tableexport.css b/src/stable/css/tableexport.css
@@ -1,5 +1,5 @@
 /*!
- * TableExport.js v3.2.9 (https://www.travismclarke.com)
+ * TableExport.js v3.2.10 (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