about summary refs log tree commit diff
path: root/app/assets/javascripts/components/features
diff options
context:
space:
mode:
authorgeta6 <getakura@gmail.com>2017-04-18 20:10:49 +0900
committerEugen <eugen@zeonfederated.com>2017-04-18 13:10:49 +0200
commit75910abd8f9b40a08e8b4a79979b99ec841c6cd9 (patch)
tree97b8a26716924fd4d2af4b4282a1f253a4401908 /app/assets/javascripts/components/features
parent93c13fe691750e8c7f0c90091bca2564b97ccba7 (diff)
Add hasMore field to account timeline (#2066)
Diffstat (limited to 'app/assets/javascripts/components/features')
-rw-r--r--app/assets/javascripts/components/features/account_timeline/index.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/account_timeline/index.jsx b/app/assets/javascripts/components/features/account_timeline/index.jsx
index f92e1b49c..edae976b9 100644
--- a/app/assets/javascripts/components/features/account_timeline/index.jsx
+++ b/app/assets/javascripts/components/features/account_timeline/index.jsx
@@ -46,7 +46,9 @@ const AccountTimeline = React.createClass({
   },
 
   handleScrollToBottom () {
-    this.props.dispatch(expandAccountTimeline(Number(this.props.params.accountId)));
+    if (!this.props.isLoading && this.props.hasMore) {
+      this.props.dispatch(expandAccountTimeline(Number(this.props.params.accountId)));
+    }
   },
 
   render () {