about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/notifications/index.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-11-10 15:04:13 +0100
committerGitHub <noreply@github.com>2018-11-10 15:04:13 +0100
commit3cecf3e5b995f5035b17fd9572c17ba1ede9346b (patch)
tree945d7c515c6bd4fac1923a1635016bc2c6657a29 /app/javascript/mastodon/features/notifications/index.js
parent2f86fc5e0a45eb2002d4b481ae093197ad523479 (diff)
Fix loading indicator inconsistency (#9252)
* Use global loading indicator when loading more items

* Use local loading indicator for notifications

And remove global loading indicator for initial custom emojis load
Diffstat (limited to 'app/javascript/mastodon/features/notifications/index.js')
-rw-r--r--app/javascript/mastodon/features/notifications/index.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 66af0baaf..aa82dbbb9 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -153,6 +153,7 @@ class Notifications extends React.PureComponent {
         scrollKey={`notifications-${columnId}`}
         trackScroll={!pinned}
         isLoading={isLoading}
+        showLoading={isLoading && notifications.size === 0}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
         onLoadMore={this.handleLoadOlder}