about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-20 16:34:42 +0100
committerEugen Rochko <eugen@zeonfederated.com>2020-01-20 16:34:42 +0100
commit2d5addde03563b03b59e9125cdc46143a13e9566 (patch)
treea407d7f476b976a66c008584f36a5ec7832cc8cc /app/javascript
parent39f2bce23104ed7352318c2976c728b5553976e2 (diff)
Fix “X new items” not showing up for slow mode on empty timelines (#12875)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/components/scrollable_list.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 47a87b149..3a490e78e 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -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'>