tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix load more on account timelines (regression from #3311) (#3475)

Browse Source 
This prevents `next` state from being overridden on the loading *new* statuses.
This commit is contained in:
unarist
2017-05-31 22:30:26 +09:00
committed by Eugen Rochko
parent 0e12a8dab9
commit e49dc6a06e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/actions/accounts.js
View File

@ -107,7 +107,9 @@ export function fetchAccountTimeline(id, replace = false) {
let params = {};
let skipLoading = false;
if (newestId !== null && !replace) {
replace = replace || newestId === null;
if (!replace) {
params.since_id = newestId;
skipLoading = true;
}
@ -131,7 +133,9 @@ export function fetchAccountMediaTimeline(id, replace = false) {
let params = { only_media: 'true', limit: 12 };
let skipLoading = false;
if (newestId !== null && !replace) {
replace = replace || newestId === null;
if (!replace) {
params.since_id = newestId;
skipLoading = true;
}