about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/community_timeline
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-09-16 15:45:06 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-09-16 15:45:06 +0200
commitf1098675782944fe1dabec71cd58d3d091da06a0 (patch)
tree6cabc8ea376ee626c744e882401a31a4bd7a7a75 /app/javascript/mastodon/features/community_timeline
parent5eff29b28c226e443ea5484ed50c8020a43fbc6b (diff)
Fix “slow mode” issues (#11859)
* Fix weird scroll-jumping behavior with pending items

* Treat pending items as unread items

* Fix scroll position being altered because of the “X new items” button
Diffstat (limited to 'app/javascript/mastodon/features/community_timeline')
-rw-r--r--app/javascript/mastodon/features/community_timeline/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index f95fa4970..cb93f9c22 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -20,7 +20,7 @@ const mapStateToProps = (state, { onlyMedia, columnId }) => {
   const index = columns.findIndex(c => c.get('uuid') === uuid);
 
   return {
-    hasUnread: state.getIn(['timelines', `community${onlyMedia ? ':media' : ''}`, 'unread']) > 0,
+    hasUnread: state.getIn(['timelines', `community${onlyMedia ? ':media' : ''}`, 'unread']) > 0 || state.getIn(['timelines', `community${onlyMedia ? ':media' : ''}`, 'pendingItems']).size > 0,
     onlyMedia: (columnId && index >= 0) ? columns.get(index).getIn(['params', 'other', 'onlyMedia']) : state.getIn(['settings', 'community', 'other', 'onlyMedia']),
   };
 };