diff options
| author | Henry Jameson <me@hjkos.com> | 2019-01-13 22:21:09 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-01-13 22:21:09 +0300 |
| commit | f9fb85ee42ffe04d7f3532342d26f89a16b2a259 (patch) | |
| tree | 53790ded22d36aaaa0b990141bd1c8f65c234b15 /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 519f49e29b38e568727dd7f59618002459a64d64 (diff) | |
| parent | 52579b09b17ff7260dc64b673545fb4690aed939 (diff) | |
Merge remote-tracking branch 'upstream/develop' into favorites
* upstream/develop:
Add Korean translation
Change emptlyTl to take userId
better fix
fixes #265 and also that thin line below gradient on chrome (UGH)
fix #262 part of user profiles not being able to load previous posts
Retain userId on clearing user timeline, don't flush when empty timeline
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 6c9d59ff..126e07cf 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -31,7 +31,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false return apiService.fetchTimeline(args) .then((statuses) => { - if (!older && statuses.length >= 20 && !timelineData.loading) { + if (!older && statuses.length >= 20 && !timelineData.loading && timelineData.statuses.length) { store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId }) } update({store, statuses, timeline, showImmediately, userId}) |