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/ui | |
| parent | 4a146a0d189280dbd15098f42850ca550e0d7910 (diff) | |
| parent | 21c209636d12ea601379e7abd3d370ad0d22ea18 (diff) | |
Merge branch 'master' into boostspin
Diffstat (limited to 'app/assets/javascripts/components/features/ui')
| -rw-r--r-- | app/assets/javascripts/components/features/ui/containers/status_list_container.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx index ffb6f6e79..8af7b0c3c 100644 --- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx @@ -33,7 +33,8 @@ const getStatusIds = createSelector([ })); const mapStateToProps = (state, props) => ({ - statusIds: getStatusIds(state, props) + statusIds: getStatusIds(state, props), + isLoading: state.getIn(['timelines', props.type, 'isLoading'], true) }); const mapDispatchToProps = (dispatch, { type, id }) => ({ |