about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-07-05 21:51:53 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-07-05 14:51:53 +0200
commitb52a5e6bd60be3f9548cf59eb313b1e6c2f5920e (patch)
treee9190993bf38ed1459ce3d5c0e3818c604991ca8 /app/javascript
parentbb194ddb3c65394c256c381834ba3bce4d2988cc (diff)
Show LoadMore button on Notifications even if all items are filtered (#4077)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/notifications/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index ed4b3ad98..2f545fa4a 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -122,7 +122,7 @@ export default class Notifications extends React.PureComponent {
     let unread         = '';
     let scrollContainer = '';
 
-    if (!isLoading && notifications.size > 0 && hasMore) {
+    if (!isLoading && hasMore) {
       loadMore = <LoadMore onClick={this.handleLoadMore} />;
     }
 
@@ -132,7 +132,7 @@ export default class Notifications extends React.PureComponent {
 
     if (isLoading && this.scrollableArea) {
       scrollableArea = this.scrollableArea;
-    } else if (notifications.size > 0) {
+    } else if (notifications.size > 0 || hasMore) {
       scrollableArea = (
         <div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
           {unread}