about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-19 22:23:16 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-12-19 22:23:16 +0100
commit8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 (patch)
tree5bf022ace3e7f65471bd16a6a06b5eb0750c0ab4 /app/javascript
parent5d724aa129db8e77d25748ceff4c8f1047662491 (diff)
Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581)
Fixes #9568
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 774c8835d..fec06e263 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -49,7 +49,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();
       }