Merge pull request #350 from bouk/no-circular

Remove circular dependency between griddle and gridRowContainer
GriddleGriddle · Mar 4, 2016 · 357ebee · 357ebee
2 parents 50f0ac6 + d677b89
commit 357ebee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/gridRowContainer.jsx b/scripts/gridRowContainer.jsx
@@ -84,7 +84,7 @@ var GridRowContainer = React.createClass({
               var key = that.props.rowSettings.getRowKey(row, index);
 
               if(typeof row["children"] !== "undefined"){
-                var Griddle = require('./griddle.jsx');
+                var Griddle = this.constructor.Griddle;
                 return (
                   <tr key={key} style={{paddingLeft: 5}}>
                     <td colSpan={that.props.columnSettings.getVisibleColumnCount()} className="griddle-parent" style={that.props.useGriddleStyles ? {border: "none", "padding": "0 0 0 5px"} : null}>

diff --git a/scripts/griddle.jsx b/scripts/griddle.jsx
@@ -12,6 +12,7 @@ var GridPagination = require('./gridPagination.jsx');
 var GridSettings = require('./gridSettings.jsx');
 var GridNoData = require('./gridNoData.jsx');
 var GridRow = require('./gridRow.jsx');
+var GridRowContainer = require('./gridRowContainer.jsx');
 var CustomRowComponentContainer = require('./customRowComponentContainer.jsx');
 var CustomPaginationContainer = require('./customPaginationContainer.jsx');
 var CustomFilterContainer = require('./customFilterContainer.jsx');
@@ -808,4 +809,4 @@ var Griddle = React.createClass({
     }
 });
 
-module.exports = Griddle;
+GridRowContainer.Griddle = module.exports = Griddle;