]> cat aescling's git repositories - mastodon.git/commitdiff
Fix “X new items” not showing up for slow mode on empty timelines (#12875)
authorThibG <thib@sitedethib.com>
Mon, 20 Jan 2020 15:34:42 +0000 (16:34 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 20 Jan 2020 15:34:42 +0000 (16:34 +0100)
app/javascript/mastodon/components/scrollable_list.js

index 47a87b149a26e9cb67373e71fa359e9aef7dde4b..3a490e78ea76ad9dab33d5f0ad3d33e053176da1 100644 (file)
@@ -296,7 +296,7 @@ export default class ScrollableList extends PureComponent {
           </div>
         </div>
       );
-    } else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) {
+    } else if (isLoading || childrenCount > 0 || numPending > 0 || hasMore || !emptyMessage) {
       scrollableArea = (
         <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseMove={this.handleMouseMove}>
           <div role='feed' className='item-list'>