diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-05 22:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 22:20:58 +0100 |
| commit | 772b4ba24c60e0394d25d0fad4eefb338a9befea (patch) | |
| tree | 804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/javascript/flavours/glitch/reducers/timelines.js | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 866496ac16b47ee17138db600519a630be833e4e (diff) | |
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/timelines.js')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/timelines.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js index d7d5ac43f..4179cf477 100644 --- a/app/javascript/flavours/glitch/reducers/timelines.js +++ b/app/javascript/flavours/glitch/reducers/timelines.js @@ -29,6 +29,8 @@ const initialTimeline = ImmutableMap({ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => { return state.update(timeline, initialTimeline, map => map.withMutations(mMap => { mMap.set('isLoading', false); + mMap.set('isPartial', isPartial); + if (!next && !isLoadingRecent) mMap.set('hasMore', false); if (!statuses.isEmpty()) { |