gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Switch to compose route when replying and compose is not mounted

Browse source
This commit is contained in:
Eugen Rochko 2016-11-21 10:52:11 +01:00
parent 93577f74e7
commit d32e0364f9
6 changed files with 56 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/components/features/compose/index.jsx
View file

@ -1,12 +1,13 @@
import Drawer from './components/drawer';
import Drawer from './components/drawer';
import ComposeFormContainer from './containers/compose_form_container';
import UploadFormContainer from './containers/upload_form_container';
import NavigationContainer from './containers/navigation_container';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import UploadFormContainer from './containers/upload_form_container';
import NavigationContainer from './containers/navigation_container';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import SuggestionsContainer from './containers/suggestions_container';
import SearchContainer from './containers/search_container';
import SearchContainer from './containers/search_container';
import { fetchSuggestions } from '../../actions/suggestions';
import { connect } from 'react-redux';
import { connect } from 'react-redux';
import { mountCompose, unmountCompose } from '../../actions/compose';
const Compose = React.createClass({
@ -17,9 +18,14 @@ const Compose = React.createClass({
mixins: [PureRenderMixin],
componentDidMount () {
this.props.dispatch(mountCompose());
this.props.dispatch(fetchSuggestions());
},
componentWillUnmount () {
this.props.dispatch(unmountCompose());
},
render () {
return (
<Drawer>

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

@ -38,6 +38,9 @@ const makeMapStateToProps = () => {
};
const Status = React.createClass({
contextTypes: {
router: React.PropTypes.object
},
propTypes: {
params: React.PropTypes.object.isRequired,
@ -64,7 +67,7 @@ const Status = React.createClass({
},
handleReplyClick (status) {
this.props.dispatch(replyCompose(status));
this.props.dispatch(replyCompose(status, this.context.router));
},
handleReblogClick (status) {