From 222b7a99582e10558fc36e731911a68faaa79838 Mon Sep 17 00:00:00 2001 From: pankajJS Date: Fri, 26 Aug 2016 11:40:24 +0530 Subject: [PATCH 1/2] getCurrentPage Issue resolved --- modules/griddle.jsx.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/griddle.jsx.js b/modules/griddle.jsx.js index ca230e3e..de7a01f4 100644 --- a/modules/griddle.jsx.js +++ b/modules/griddle.jsx.js @@ -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; From 03d5b5f4fd02881516177b86b21610115f0bf909 Mon Sep 17 00:00:00 2001 From: pankajJS Date: Fri, 26 Aug 2016 11:42:09 +0530 Subject: [PATCH 2/2] getCurrentPage function issue resolved --- modules/griddle.jsx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/griddle.jsx.js b/modules/griddle.jsx.js index de7a01f4..719082d5 100644 --- a/modules/griddle.jsx.js +++ b/modules/griddle.jsx.js @@ -594,7 +594,7 @@ var Griddle = React.createClass({ return this.state.filteredResults || this.props.results; }, getCurrentPage: function getCurrentPage() { - if(this.props.externalCurrentPage===null && this.props.externalCurrentPage===undefined) + if(this.props.externalCurrentPage===null || this.props.externalCurrentPage===undefined) return this.state.page; else{ return this.props.externalCurrentPage;