diff options
author | Eugen <eugen@zeonfederated.com> | 2017-01-24 14:27:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 14:27:13 +0100 |
commit | 4f3264d2912d1b70a22099f1c713691f91ba890d (patch) | |
tree | 8a48ce38d47351bc3739cebd3672d40c98763807 /app/assets/javascripts/components/features/account_timeline/index.jsx | |
parent | 4a146a0d189280dbd15098f42850ca550e0d7910 (diff) | |
parent | 21c209636d12ea601379e7abd3d370ad0d22ea18 (diff) |
Merge branch 'master' into boostspin
Diffstat (limited to 'app/assets/javascripts/components/features/account_timeline/index.jsx')
-rw-r--r-- | app/assets/javascripts/components/features/account_timeline/index.jsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/account_timeline/index.jsx b/app/assets/javascripts/components/features/account_timeline/index.jsx index 4a66dbbf5..5c09839f7 100644 --- a/app/assets/javascripts/components/features/account_timeline/index.jsx +++ b/app/assets/javascripts/components/features/account_timeline/index.jsx @@ -9,7 +9,8 @@ import StatusList from '../../components/status_list'; import LoadingIndicator from '../../components/loading_indicator'; const mapStateToProps = (state, props) => ({ - statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId)]), + statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items']), + isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']), me: state.getIn(['meta', 'me']) }); @@ -19,6 +20,7 @@ const AccountTimeline = React.createClass({ params: React.PropTypes.object.isRequired, dispatch: React.PropTypes.func.isRequired, statusIds: ImmutablePropTypes.list, + isLoading: React.PropTypes.bool, me: React.PropTypes.number.isRequired }, @@ -39,13 +41,13 @@ const AccountTimeline = React.createClass({ }, render () { - const { statusIds, me } = this.props; + const { statusIds, isLoading, me } = this.props; if (!statusIds) { return <LoadingIndicator />; } - return <StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} /> + return <StatusList statusIds={statusIds} isLoading={isLoading} me={me} onScrollToBottom={this.handleScrollToBottom} /> } }); |