Now hiding paging content if there's no data.

GriddleGriddle · Jan 16, 2016 · 2ede4f7 · 2ede4f7
1 parent 4f50a78
commit 2ede4f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build/griddle.js b/build/griddle.js
@@ -1107,9 +1107,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        "padding": "0",
 	        backgroundColor: "#EDEDED",
 	        border: "0",
-	        color: "#222"
+	        color: "#222",
+	        height: this.props.showNoData ? "20px" : null
 	      } : null;
-	      pagingContent = React.createElement('tbody', null, React.createElement('tr', null, React.createElement('td', { colSpan: this.props.multipleSelectionSettings.isMultipleSelection ? this.props.columnSettings.getVisibleColumnCount() + 1 : this.props.columnSettings.getVisibleColumnCount(), style: pagingStyles, className: 'footer-container' }, this.props.pagingContent)));
+	      pagingContent = React.createElement('tbody', null, React.createElement('tr', null, React.createElement('td', { colSpan: this.props.multipleSelectionSettings.isMultipleSelection ? this.props.columnSettings.getVisibleColumnCount() + 1 : this.props.columnSettings.getVisibleColumnCount(), style: pagingStyles, className: 'footer-container' }, !this.props.showNoData ? this.props.pagingContent : null)));
 	    }
 
 	    // If we have a fixed header, split into two tables.

diff --git a/scripts/gridTable.jsx b/scripts/gridTable.jsx
@@ -259,12 +259,13 @@ var GridTable = React.createClass({
           "padding" : "0",
           backgroundColor: "#EDEDED",
           border: "0",
-          color: "#222"
+          color: "#222",
+          height: this.props.showNoData ? "20px" : null
         }
         : null;
       pagingContent = (<tbody><tr>
           <td colSpan={this.props.multipleSelectionSettings.isMultipleSelection ? this.props.columnSettings.getVisibleColumnCount() + 1 : this.props.columnSettings.getVisibleColumnCount()} style={pagingStyles} className="footer-container">
-            {this.props.pagingContent}
+            {!this.props.showNoData ? this.props.pagingContent : null}
           </td>
         </tr></tbody>)
     }