diff options
Diffstat (limited to 'app/assets/javascripts/components/features')
| -rw-r--r-- | app/assets/javascripts/components/features/account_timeline/index.jsx | 4 |
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 () { |