diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-23 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 15:23:12 +0100 |
| commit | 8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch) | |
| tree | b5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/javascript/flavours/glitch/components/scrollable_list.js | |
| parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
| parent | cb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff) | |
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components/scrollable_list.js')
| -rw-r--r-- | app/javascript/flavours/glitch/components/scrollable_list.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/scrollable_list.js b/app/javascript/flavours/glitch/components/scrollable_list.js index bd922462e..21d717b81 100644 --- a/app/javascript/flavours/glitch/components/scrollable_list.js +++ b/app/javascript/flavours/glitch/components/scrollable_list.js @@ -47,7 +47,7 @@ export default class ScrollableList extends PureComponent { const { scrollTop, scrollHeight, clientHeight } = this.node; const offset = scrollHeight - scrollTop - clientHeight; - if (400 > offset && this.props.onLoadMore && !this.props.isLoading) { + if (400 > offset && this.props.onLoadMore && this.props.hasMore && !this.props.isLoading) { this.props.onLoadMore(); } |