diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-30 17:49:27 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-30 17:49:27 +0000 |
| commit | 1717e700469cb6331e2905c7af0d384cf78a1188 (patch) | |
| tree | 8bb0b6f4fa6c8b81c697abc3fb707e4750f66004 /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 0bd77149a06bcd7e0a904d0f5c2e2691996ff898 (diff) | |
| parent | 7666d50d8a9eb2ef8b5a61a1689b7358ae7d93ea (diff) | |
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
Diffstat (limited to 'src/services/timeline_fetcher/timeline_fetcher.service.js')
| -rw-r--r-- | src/services/timeline_fetcher/timeline_fetcher.service.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index 727f6c60..08d91b5a 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -35,6 +35,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId }) } update({store, statuses, timeline, showImmediately, userId}) + return statuses }, () => store.dispatch('setError', { value: true })) } |