sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactoring redux state into different reducers

Browse source
This commit is contained in:
Eugen Rochko 2016-10-30 15:06:43 +01:00
parent 7060bdf04b
commit e8ff4c8e56
23 changed files with 352 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/components/features/status/index.jsx
View file

@ -31,7 +31,7 @@ const makeMapStateToProps = () => {
status: getStatus(state, Number(props.params.statusId)),
ancestorsIds: state.getIn(['timelines', 'ancestors', Number(props.params.statusId)]),
descendantsIds: state.getIn(['timelines', 'descendants', Number(props.params.statusId)]),
me: state.getIn(['timelines', 'me'])
me: state.getIn(['meta', 'me'])
});
return mapStateToProps;
@ -43,8 +43,8 @@ const Status = React.createClass({
params: React.PropTypes.object.isRequired,
dispatch: React.PropTypes.func.isRequired,
status: ImmutablePropTypes.map,
ancestorsIds: ImmutablePropTypes.orderedSet,
descendantsIds: ImmutablePropTypes.orderedSet
ancestorsIds: ImmutablePropTypes.list,
descendantsIds: ImmutablePropTypes.list
},
mixins: [PureRenderMixin],
@ -101,11 +101,11 @@ const Status = React.createClass({
const account = status.get('account');
if (ancestorsIds) {
if (ancestorsIds && ancestorsIds.size > 0) {
ancestors = <div>{this.renderChildren(ancestorsIds)}</div>;
}
if (descendantsIds) {
if (descendantsIds && descendantsIds.size > 0) {
descendants = <div>{this.renderChildren(descendantsIds)}</div>;
}