diff --git a/js/forum/src/components/discussion-list.js b/js/forum/src/components/discussion-list.js index 96de9daf3..14eca9046 100644 --- a/js/forum/src/components/discussion-list.js +++ b/js/forum/src/components/discussion-list.js @@ -60,23 +60,23 @@ export default class DiscussionList extends Component { return this.props.params.sort === 'replies' ? 'replies' : 'unread'; } - loadResults(start) { + loadResults(offset) { var params = this.params(); - params.start = start; + params.page = {offset}; return app.store.find('discussions', params); } loadMore() { var self = this; this.loading(true); - this.loadResults(this.discussions().length).then((results) => this.parseResults(results, true)); + this.loadResults(this.discussions().length).then((results) => this.parseResults(results)); } - parseResults(results, append) { + parseResults(results) { m.startComputation(); this.loading(false); [].push.apply(this.discussions(), results); - this.moreResults(!!results.meta.moreUrl); + this.moreResults(!!results.payload.links.next); m.endComputation(); return results; } diff --git a/js/lib/store.js b/js/lib/store.js index 8801504dd..3299699da 100644 --- a/js/lib/store.js +++ b/js/lib/store.js @@ -7,7 +7,6 @@ export default class Store { pushPayload(payload) { payload.included && payload.included.map(this.pushObject.bind(this)) var result = payload.data instanceof Array ? payload.data.map(this.pushObject.bind(this)) : this.pushObject(payload.data); - result.meta = payload.meta; result.payload = payload; return result; }