v5.0.0-rc.3 - fix handle{Row,Col}Span ordering and terminating condit…

…ions
clarketm · Jun 2, 2017 · aece6ca · aece6ca
1 parent ff3dd50
commit aece6ca
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 /assets
 /index.html
 /search
-/test
+test
 /module
 /docs/_book
 rollup.config.js

diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-# [TableExport](https://tableexport.v4.travismclarke.com) &nbsp; [![Build Status](https://travis-ci.org/clarketm/TableExport.svg?branch=master)](https://travis-ci.org/clarketm/TableExport)
+[![Build Status](https://travis-ci.org/clarketm/TableExport.svg?branch=master)](https://travis-ci.org/clarketm/TableExport)
+
+# [TableExport](https://tableexport.v4.travismclarke.com)
 The simple, easy-to-implement library to export HTML tables to `xlsx`, `xls`, `csv`, and `txt` files.
 
 ## Docs
@@ -328,6 +330,7 @@ When used alongside Bootstrap, there are four custom classes **`.xlsx`, `.xls`,
 - [x] Reimplement and test the `update`, `reset`, and `remove` **TableExport** prototype properties without requiring jQuery.
 - [x] Make jQuery as *peer dependency* and ensure proper **TableExport** rendering in browser, AMD, and CommonJS environments.
 - [x] Force jQuery to be an optionally loaded module.
+- [ ] Use the enhanced [SheetJS](https://github.com/SheetJS/js-xlsx#supported-output-formats) `csv` and `txt` formats when the library is available.
 - [ ] Allow `ignoreCSS` and `emptyCSS` to work with any `selector|selector[]` instead of solely a single CSS class.
 - [ ] Ensure (via testing) full consistency and backwards-compatibility for jQuery.
 - [ ] Add **Export as PDF** support.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport.js",
-  "version": "5.0.0-rc.2",
+  "version": "5.0.0-rc.3",
   "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.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (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.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (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.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - Travis Clarke - https://www.travismclarke.com
  *
@@ -106,7 +106,7 @@
                     };
                 })();
 
-                context.rcMap = new RowColMap().build.call(self, context);
+                context.rcMap = new RowColMap().build(context, settings);
 
                 var formatMap = {};
                 for (var type in _FORMAT) {
@@ -142,7 +142,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.0-rc.2',
+            version: '5.0.0-rc.3',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -811,13 +811,15 @@
             };
             this.getRowColMapProp = function (ir, ic, key) {
                 if (this.rcMap[ir]) {
-                    if (typeof ic === 'undefined') {
+                    if (typeof key === 'undefined') {
+                        return this.rcMap[ir][ic];
+                    } else if (typeof ic === 'undefined') {
                         return this.rcMap[ir][key];
                     } else if (this.rcMap[ir][ic]) {
                         return this.rcMap[ir][ic][key];
                     }
                 }
-                return false;
+                return undefined;
             };
             this.setRowColMapProp = function (ir, ic, key, value) {
                 this.rcMap[ir] = this.rcMap[ir] || [];
@@ -880,38 +882,48 @@
                 SPAN: 'span',
                 DEFAULT: 'default'
             },
-            build: function (context) {
+            build: function (context, settings) {
                 var self = this;
-                var settings = self.settings;
 
-                var OFFSET = 1;
-
-                var _RowColMap = new RowColMap();
+                var OFFSET = self.OFFSET;
+                var rowLength = self.rowLength = context.rows.length;
+                // var colLength = self.colLength = Math.max.apply(null,
+                //     _nodesArray(context.rows).map(function (val) {
+                //         return val.querySelectorAll('th, td').length
+                //     }));
 
                 var handleIgnoreRow = function (ir) {
-                    _RowColMap.setRowColMapProp(ir, undefined, _RowColMap.TYPE.IGNORE, true);
-
+                    self.setRowColMapProp(ir, undefined, self.TYPE.IGNORE, true);
                 };
                 var handleIgnoreCol = function (ir, ic) {
-                    _RowColMap.setRowColMapProp(ir, ic, _RowColMap.TYPE.IGNORE, true);
+                    self.setRowColMapProp(ir, ic, self.TYPE.IGNORE, true);
                 };
                 var handleEmpty = function (ir, ic) {
-                    _RowColMap.setRowColMapProp(ir, ic, _RowColMap.TYPE.EMPTY, true);
+                    self.setRowColMapProp(ir, ic, self.TYPE.EMPTY, true);
                 };
                 var handleRowSpan = function (val, ir, ic) {
                     var rowSpan = val.getAttribute('rowspan');
                     var hasColSpan = val.hasAttribute('colspan');
-                    hasColSpan && handleColSpan(val, ir, ic);
-                    for (var _row = 1; _row < rowSpan; _row++) {
-                        _RowColMap.setRowColMapProp(_row + ir, undefined, _RowColMap.TYPE.SPAN, true);
-                        _RowColMap.setRowColMapProp(_row + ir, ic, undefined, 1);
+
+                    for (var _row = 0; _row < rowSpan; _row++) {
+                        if (_row + ir >= rowLength) {
+                            return;
+                        }
                         hasColSpan && handleColSpan(val, _row + ir, ic);
+                        if (_row >= 1) {
+                            self.setRowColMapProp(_row + ir, undefined, self.TYPE.SPAN, true);
+                            self.setRowColMapProp(_row + ir, ic, undefined, 1);
+                        }
                     }
                 };
                 var handleColSpan = function (val, ir, ic) {
                     var colSpan = val.getAttribute('colspan');
-                    _RowColMap.setRowColMapProp(ir, undefined, _RowColMap.TYPE.SPAN, true);
-                    _RowColMap.setRowColMapProp(ir, ic + OFFSET, undefined, colSpan - OFFSET);
+
+                    if (colSpan <= 1) {
+                        return;
+                    }
+                    self.setRowColMapProp(ir, undefined, self.TYPE.SPAN, true);
+                    self.setRowColMapProp(ir, ic + OFFSET, undefined, colSpan - OFFSET);
                 };
 
                 _nodesArray(context.rows).map(function (val, ir) {
@@ -934,7 +946,7 @@
                     });
                 });
 
-                return _RowColMap;
+                return self;
             }
         };
 

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

diff --git a/docs/README.md b/docs/README.md
@@ -1,4 +1,6 @@
-# [TableExport](https://tableexport.v4.travismclarke.com) &nbsp; [![Build Status](https://travis-ci.org/clarketm/TableExport.svg?branch=master)](https://travis-ci.org/clarketm/TableExport)
+[![Build Status](https://travis-ci.org/clarketm/TableExport.svg?branch=master)](https://travis-ci.org/clarketm/TableExport)
+
+# [TableExport](https://tableexport.v4.travismclarke.com)
 The simple, easy-to-implement library to export HTML tables to `xlsx`, `xls`, `csv`, and `txt` files.
 
 ## Docs
@@ -328,6 +330,7 @@ When used alongside Bootstrap, there are four custom classes **`.xlsx`, `.xls`,
 - [x] Reimplement and test the `update`, `reset`, and `remove` **TableExport** prototype properties without requiring jQuery.
 - [x] Make jQuery as *peer dependency* and ensure proper **TableExport** rendering in browser, AMD, and CommonJS environments.
 - [x] Force jQuery to be an optionally loaded module.
+- [ ] Use the enhanced [SheetJS](https://github.com/SheetJS/js-xlsx#supported-output-formats) `csv` and `txt` formats when the library is available.
 - [ ] Allow `ignoreCSS` and `emptyCSS` to work with any `selector|selector[]` instead of solely a single CSS class.
 - [ ] Ensure (via testing) full consistency and backwards-compatibility for jQuery.
 - [ ] Add **Export as PDF** support.

diff --git a/gitbook b/gitbook
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tableexport",
-  "version": "5.0.0-rc.2",
+  "version": "5.0.0-rc.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 v5.0.0-rc.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (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.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (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.2 (https://www.travismclarke.com)
+ * TableExport.js v5.0.0-rc.3 (https://www.travismclarke.com)
  *
  * Copyright (c) 2017 - Travis Clarke - https://www.travismclarke.com
  *
@@ -106,7 +106,7 @@
                     };
                 })();
 
-                context.rcMap = new RowColMap().build.call(self, context);
+                context.rcMap = new RowColMap().build(context, settings);
 
                 var formatMap = {};
                 for (var type in _FORMAT) {
@@ -142,7 +142,7 @@
              * Version.
              * @memberof TableExport.prototype
              */
-            version: '5.0.0-rc.2',
+            version: '5.0.0-rc.3',
             /**
              * Default library options.
              * @memberof TableExport.prototype
@@ -811,13 +811,15 @@
             };
             this.getRowColMapProp = function (ir, ic, key) {
                 if (this.rcMap[ir]) {
-                    if (typeof ic === 'undefined') {
+                    if (typeof key === 'undefined') {
+                        return this.rcMap[ir][ic];
+                    } else if (typeof ic === 'undefined') {
                         return this.rcMap[ir][key];
                     } else if (this.rcMap[ir][ic]) {
                         return this.rcMap[ir][ic][key];
                     }
                 }
-                return false;
+                return undefined;
             };
             this.setRowColMapProp = function (ir, ic, key, value) {
                 this.rcMap[ir] = this.rcMap[ir] || [];
@@ -880,38 +882,48 @@
                 SPAN: 'span',
                 DEFAULT: 'default'
             },
-            build: function (context) {
+            build: function (context, settings) {
                 var self = this;
-                var settings = self.settings;
 
-                var OFFSET = 1;
-
-                var _RowColMap = new RowColMap();
+                var OFFSET = self.OFFSET;
+                var rowLength = self.rowLength = context.rows.length;
+                // var colLength = self.colLength = Math.max.apply(null,
+                //     _nodesArray(context.rows).map(function (val) {
+                //         return val.querySelectorAll('th, td').length
+                //     }));
 
                 var handleIgnoreRow = function (ir) {
-                    _RowColMap.setRowColMapProp(ir, undefined, _RowColMap.TYPE.IGNORE, true);
-
+                    self.setRowColMapProp(ir, undefined, self.TYPE.IGNORE, true);
                 };
                 var handleIgnoreCol = function (ir, ic) {
-                    _RowColMap.setRowColMapProp(ir, ic, _RowColMap.TYPE.IGNORE, true);
+                    self.setRowColMapProp(ir, ic, self.TYPE.IGNORE, true);
                 };
                 var handleEmpty = function (ir, ic) {
-                    _RowColMap.setRowColMapProp(ir, ic, _RowColMap.TYPE.EMPTY, true);
+                    self.setRowColMapProp(ir, ic, self.TYPE.EMPTY, true);
                 };
                 var handleRowSpan = function (val, ir, ic) {
                     var rowSpan = val.getAttribute('rowspan');
                     var hasColSpan = val.hasAttribute('colspan');
-                    hasColSpan && handleColSpan(val, ir, ic);
-                    for (var _row = 1; _row < rowSpan; _row++) {
-                        _RowColMap.setRowColMapProp(_row + ir, undefined, _RowColMap.TYPE.SPAN, true);
-                        _RowColMap.setRowColMapProp(_row + ir, ic, undefined, 1);
+
+                    for (var _row = 0; _row < rowSpan; _row++) {
+                        if (_row + ir >= rowLength) {
+                            return;
+                        }
                         hasColSpan && handleColSpan(val, _row + ir, ic);
+                        if (_row >= 1) {
+                            self.setRowColMapProp(_row + ir, undefined, self.TYPE.SPAN, true);
+                            self.setRowColMapProp(_row + ir, ic, undefined, 1);
+                        }
                     }
                 };
                 var handleColSpan = function (val, ir, ic) {
                     var colSpan = val.getAttribute('colspan');
-                    _RowColMap.setRowColMapProp(ir, undefined, _RowColMap.TYPE.SPAN, true);
-                    _RowColMap.setRowColMapProp(ir, ic + OFFSET, undefined, colSpan - OFFSET);
+
+                    if (colSpan <= 1) {
+                        return;
+                    }
+                    self.setRowColMapProp(ir, undefined, self.TYPE.SPAN, true);
+                    self.setRowColMapProp(ir, ic + OFFSET, undefined, colSpan - OFFSET);
                 };
 
                 _nodesArray(context.rows).map(function (val, ir) {
@@ -934,7 +946,7 @@
                     });
                 });
 
-                return _RowColMap;
+                return self;
             }
         };
 

diff --git a/src/stable/js/tableexport.min.js b/src/stable/js/tableexport.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     /assets
     /index.html
     /search
-    /test
+    test
     /module
     /docs/_book
     rollup.config.js
@@ Expand Down @@