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

Cleaning up action names and compose drawer

Browse source
This commit is contained in:
Eugen Rochko 2016-08-31 16:15:12 +02:00
parent 92afd29650
commit 72591cc6d5
29 changed files with 468 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/components/containers/composer_drawer_container.jsx
View file

@ -1,15 +1,22 @@
import { connect } from 'react-redux';
import ComposerDrawer from '../components/composer_drawer';
import { publish } from '../actions/statuses';
import { connect } from 'react-redux';
import ComposerDrawer from '../components/composer_drawer';
import { changeCompose, submitCompose } from '../actions/compose';
const mapStateToProps = function (state, props) {
return {};
return {
text: state.getIn(['compose', 'text']),
isSubmitting: state.getIn(['compose', 'isSubmitting'])
};
};
const mapDispatchToProps = function (dispatch) {
return {
onSubmit: function (text, in_reply_to_id) {
dispatch(publish(text, in_reply_to_id));
onChange: function (text) {
dispatch(changeCompose(text));
},
onSubmit: function () {
dispatch(submitCompose());
}
}
};

18
app/assets/javascripts/components/containers/root.jsx
View file

@ -1,9 +1,9 @@
import { Provider } from 'react-redux';
import configureStore from '../store/configureStore';
import Frontend from '../components/frontend';
import { setTimeline, addStatus } from '../actions/statuses';
import { setAccessToken } from '../actions/meta';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { Provider } from 'react-redux';
import configureStore from '../store/configureStore';
import Frontend from '../components/frontend';
import { setTimeline, updateTimeline } from '../actions/timelines';
import { setAccessToken } from '../actions/meta';
import PureRenderMixin from 'react-addons-pure-render-mixin';
const store = configureStore();
@ -11,7 +11,7 @@ const Root = React.createClass({
propTypes: {
token: React.PropTypes.string.isRequired,
timelines: React.PropTypes.array
timelines: React.PropTypes.object
},
mixins: [PureRenderMixin],
@ -32,13 +32,13 @@ const Root = React.createClass({
disconnected: function() {},
received: function(data) {
return store.dispatch(addStatus(data.timeline, JSON.parse(data.message)));
return store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message)));
}
});
}
},
render() {
render () {
return (
<Provider store={store}>
<Frontend />

2
app/assets/javascripts/components/containers/status_list_container.jsx
View file

@ -3,7 +3,7 @@ import StatusList from '../components/status_list';
const mapStateToProps = function (state, props) {
return {
statuses: state.getIn(['statuses', props.type])
statuses: state.getIn(['timelines', props.type])
};
};