Skip to content

Commit

Permalink
fix sizePerPage always to be options value if setState
Browse files Browse the repository at this point in the history
  • Loading branch information
AllenFang committed Jun 7, 2016
1 parent 4a04f22 commit 58540b3
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/BootstrapTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ class BootstrapTable extends Component {
currPage: page
});
} else {
const sizePerPage = options.sizePerPage || this.state.sizePerPage;
// #481
// const sizePerPage = options.sizePerPage || this.state.sizePerPage;
let sizePerPage = this.state.sizePerPage;
if (this.props.options.sizePerPage !== options.sizePerPage) {
sizePerPage = options.sizePerPage;
}

// #125
if (!options.page &&
Expand Down

0 comments on commit 58540b3

Please sign in to comment.