github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 20:57:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix discussion list pagination

Browse Source
This commit is contained in:
Toby Zerner 2015-05-07 08:58:04 +09:30
parent 0a5f6ac94d
commit db80a36729
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/core/js/forum/src/components/discussion-list.js
View File

@ -60,23 +60,23 @@ export default class DiscussionList extends Component {
return this.props.params.sort === 'replies' ? 'replies' : 'unread'; return this.props.params.sort === 'replies' ? 'replies' : 'unread';
} }
loadResults(start) { loadResults(offset) {
var params = this.params(); var params = this.params();
params.start = start; params.page = {offset};
return app.store.find('discussions', params); return app.store.find('discussions', params);
} }
loadMore() { loadMore() {
var self = this; var self = this;
this.loading(true); 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(); m.startComputation();
this.loading(false); this.loading(false);
[].push.apply(this.discussions(), results); [].push.apply(this.discussions(), results);
this.moreResults(!!results.meta.moreUrl); this.moreResults(!!results.payload.links.next);
m.endComputation(); m.endComputation();
return results; return results;
} }

1
framework/core/js/lib/store.js
View File

@ -7,7 +7,6 @@ export default class Store {
pushPayload(payload) { pushPayload(payload) {
payload.included && payload.included.map(this.pushObject.bind(this)) 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); var result = payload.data instanceof Array ? payload.data.map(this.pushObject.bind(this)) : this.pushObject(payload.data);
result.meta = payload.meta;
result.payload = payload; result.payload = payload;
return result; return result;
} }