Skip to content

Commit

Permalink
Merge pull request #568 from romanchyla/pagination-fix
Browse files Browse the repository at this point in the history
Fixed 'pagination that diappeared'
  • Loading branch information
aholachek committed Aug 21, 2015
2 parents c509bc6 + 60bc760 commit 1be8408
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/js/widgets/list_of_things/widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ define([
perPage: 20,
numFound: undefined,
currentQuery: undefined,
start: 0
start: 0,
pageData: undefined
};
options.pagination = _.defaults(options.pagination || {}, defaultPagination);

Expand Down Expand Up @@ -298,7 +299,7 @@ define([
reset: function() {
this.collection.reset();
this.hiddenCollection.reset();
this.model.clear(this.model.defaults())
this.model.set(this.model.defaults());
}

});
Expand Down
2 changes: 1 addition & 1 deletion test/mocha/js/widgets/results_render_widget.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ define([
responseWithoutHighlights.setApiQuery(new ApiQuery());

widget.reset();
expect(widget.model.get('showHighlights')).to.be.undefined;
expect(widget.model.get('showHighlights')).to.be.false;
widget.processResponse(responseWithoutHighlights);
expect(widget.model.get('showHighlights')).to.be.false;

Expand Down

0 comments on commit 1be8408

Please sign in to comment.