nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show LoadMore button on Notifications even if all items are filtered (#4077)

This commit is contained in:
unarist 2017-07-05 21:51:53 +09:00 committed by Eugen Rochko
parent bb194ddb3c
commit b52a5e6bd6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/notifications/index.js
View File

@ -122,7 +122,7 @@ export default class Notifications extends React.PureComponent {
let unread = ''; let unread = '';
let scrollContainer = ''; let scrollContainer = '';
if (!isLoading && notifications.size > 0 && hasMore) { if (!isLoading && hasMore) {
loadMore = <LoadMore onClick={this.handleLoadMore} />; loadMore = <LoadMore onClick={this.handleLoadMore} />;
} }
@ -132,7 +132,7 @@ export default class Notifications extends React.PureComponent {
if (isLoading && this.scrollableArea) { if (isLoading && this.scrollableArea) {
scrollableArea = this.scrollableArea; scrollableArea = this.scrollableArea;
} else if (notifications.size > 0) { } else if (notifications.size > 0 || hasMore) {
scrollableArea = ( scrollableArea = (
<div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}> <div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
{unread} {unread}