mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-09 09:57:06 +02:00
Code Issues Releases Wiki Activity

Change 'page' param in DiscussionList when loading more results, properly use existing param

Browse Source
This commit is contained in:
David Sevilla Martin
2019-07-25 12:03:35 -04:00
committed by Franz Liedke
parent 798a3486bf
commit b321585ee8
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
js/src/forum/components/DiscussionList.js
View File

@@ -28,6 +28,18 @@ export default class DiscussionList extends Component {
*/
this.moreResults = false;
/**
* Current page in discussion list
*/
this.page = Number(m.route.param('page')) || 1;
/**
* Number of discussions to offset for pagination
*
* @type {number}
*/
this.offset = (this.page - 1) * 20;
/**
* The discussions in the discussion list.
*
@@ -140,10 +152,10 @@ export default class DiscussionList extends Component {
/**
* Load a new page of discussion results.
*
* @param {Integer} offset The index to start the page at.
* @param {Number} offset The index to start the page at.
* @return {Promise}
*/
loadResults(offset) {
loadResults(offset = this.offset) {
const preloadedDiscussions = app.preloadedApiDocument();
if (preloadedDiscussions) {
@@ -165,7 +177,9 @@ export default class DiscussionList extends Component {
loadMore() {
this.loading = true;
this.loadResults(this.discussions.length).then(this.parseResults.bind(this));
this.page++;
this.loadResults((this.offset += 20)).then(this.parseResults.bind(this));
}
/**
@@ -180,8 +194,22 @@ export default class DiscussionList extends Component {
this.loading = false;
this.moreResults = !!results.payload.links.next;
// Construct a URL to this discussion with the updated page, then
// replace it into the window's history and our own history stack.
m.lazyRedraw();
const query = m.route.parseQueryString(document.location.search);
if (this.page !== query.page) {
if (this.page !== 1) query.page = this.page;
const url = new URL(document.location.href);
url.search = m.route.buildQueryString(query);
window.history.replaceState(null, document.title, url);
}
return results;
}