Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/griddle.jsx.js
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,11 @@ var Griddle = React.createClass({
return this.state.filteredResults || this.props.results;
},
getCurrentPage: function getCurrentPage() {
return this.props.externalCurrentPage || this.state.page;
if(this.props.externalCurrentPage===null || this.props.externalCurrentPage===undefined)
return this.state.page;
else{
return this.props.externalCurrentPage;
}
},
getCurrentSort: function getCurrentSort() {
return this.props.useExternal ? this.props.externalSortColumn : this.state.sortColumn;
Expand Down