diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-18 11:27:10 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-18 11:27:10 +0200 |
| commit | 577706987d2e09e598130d37fb9a52cd4a6510ea (patch) | |
| tree | 9fb8259f7ee58a079ed5c5826c746da53711a48e /app/javascript/mastodon/reducers/timelines.js | |
| parent | 0e6390753d4a93af7e705f7cca5946e232298fc5 (diff) | |
Fix “load more” adding older toots/notifications to pending items (#11883)
Diffstat (limited to 'app/javascript/mastodon/reducers/timelines.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/timelines.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js index 19c57ceaf..f3ed2fc59 100644 --- a/app/javascript/mastodon/reducers/timelines.js +++ b/app/javascript/mastodon/reducers/timelines.js @@ -40,7 +40,7 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is if (timeline.endsWith(':pinned')) { mMap.set('items', statuses.map(status => status.get('id'))); } else if (!statuses.isEmpty()) { - usePendingItems = usePendingItems || !mMap.get('top') || !mMap.get('pendingItems').isEmpty(); + usePendingItems = isLoadingRecent && (usePendingItems || !mMap.get('top') || !mMap.get('pendingItems').isEmpty()); mMap.update(usePendingItems ? 'pendingItems' : 'items', ImmutableList(), oldIds => { const newIds = statuses.map(status => status.get('id')); |