diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-04-14 09:52:54 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-04-14 09:52:54 +0000 |
| commit | 9587c6dac1b40ff07eb421b62010fbd98343a4d9 (patch) | |
| tree | f7882465adf2c399f9c498c5b095ac3c1969d0cf /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 3153bb5b053e1be73492ebe1b230cc313f3c5d5e (diff) | |
| parent | ab2546ab38b2aafb4456e1860477cdd63b2c4dfb (diff) | |
Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
Fix/better timeline min max id behavior
See merge request pleroma/pleroma-fe!233
Diffstat (limited to 'src/services/timeline_fetcher/timeline_fetcher.service.js')
| -rw-r--r-- | src/services/timeline_fetcher/timeline_fetcher.service.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index a4a80df0..bb5fdc2e 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -30,7 +30,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false return apiService.fetchTimeline(args) .then((statuses) => { - if (!older && statuses.length >= 20) { + if (!older && statuses.length >= 20 && !timelineData.loading) { store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId }) } update({store, statuses, timeline, showImmediately}) |
