tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replies in the compose form

Browse Source
This commit is contained in:
Eugen Rochko
2016-08-31 22:58:10 +02:00
parent 1e0e17ba85
commit dbae8062f4
15 changed files with 257 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/components/containers/composer_drawer_container.jsx
View File

@ -1,11 +1,12 @@
import { connect } from 'react-redux';
import ComposerDrawer from '../components/composer_drawer';
import { changeCompose, submitCompose } from '../actions/compose';
import { connect } from 'react-redux';
import ComposerDrawer from '../components/composer_drawer';
import { changeCompose, submitCompose, cancelReplyCompose } from '../actions/compose';
const mapStateToProps = function (state, props) {
return {
text: state.getIn(['compose', 'text']),
isSubmitting: state.getIn(['compose', 'isSubmitting'])
is_submitting: state.getIn(['compose', 'is_submitting']),
in_reply_to: state.getIn(['compose', 'in_reply_to'])
};
};
@ -17,6 +18,10 @@ const mapDispatchToProps = function (dispatch) {
onSubmit: function () {
dispatch(submitCompose());
},
onCancelReply: function () {
dispatch(cancelReplyCompose());
}
}
};

15
app/assets/javascripts/components/containers/status_list_container.jsx
View File

@ -1,5 +1,6 @@
import { connect } from 'react-redux';
import StatusList from '../components/status_list';
import { connect } from 'react-redux';
import StatusList from '../components/status_list';
import { replyCompose } from '../actions/compose';
const mapStateToProps = function (state, props) {
return {
@ -7,4 +8,12 @@ const mapStateToProps = function (state, props) {
};
};
export default connect(mapStateToProps)(StatusList);
const mapDispatchToProps = function (dispatch) {
return {
onReply: function (status) {
dispatch(replyCompose(status));
}
};
};
export default connect(mapStateToProps, mapDispatchToProps)(StatusList);