Merge pull request #366 from Julusian/nodata-colspan

NoData Component has no colspan
GriddleGriddle · Mar 23, 2016 · aa844de · aa844de
2 parents 2561e74 + b90b033
commit aa844de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build/Griddle.js b/build/Griddle.js
@@ -1078,7 +1078,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      // no data section
 	      if (this.props.showNoData) {
-	        nodes.push(React.createElement('tr', { key: 'no-data-section' }, React.createElement('td', null, this.props.noDataSection)));
+	        var colSpan = this.props.columnSettings.getVisibleColumnCount();
+	        nodes.push(React.createElement('tr', { key: 'no-data-section' }, React.createElement('td', { colSpan: colSpan }, this.props.noDataSection)));
 	      }
 
 	      // Add the spacer rows for nodes we're not rendering.

diff --git a/build/griddle.js b/build/griddle.js
@@ -1078,7 +1078,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      // no data section
 	      if (this.props.showNoData) {
-	        nodes.push(React.createElement('tr', { key: 'no-data-section' }, React.createElement('td', null, this.props.noDataSection)));
+	        var colSpan = this.props.columnSettings.getVisibleColumnCount();
+	        nodes.push(React.createElement('tr', { key: 'no-data-section' }, React.createElement('td', { colSpan: colSpan }, this.props.noDataSection)));
 	      }
 
 	      // Add the spacer rows for nodes we're not rendering.

diff --git a/scripts/gridTable.jsx b/scripts/gridTable.jsx
@@ -163,7 +163,8 @@ var GridTable = React.createClass({
 
       // no data section
       if (this.props.showNoData) {
-        nodes.push(<tr key="no-data-section"><td>{this.props.noDataSection}</td></tr>);
+        var colSpan = this.props.columnSettings.getVisibleColumnCount();
+        nodes.push(<tr key="no-data-section"><td colSpan={colSpan}>{this.props.noDataSection}</td></tr>);
       }
 
       // Add the spacer rows for nodes we're not rendering.