From 05001d54d15c486caa6cebe9462222d37d87576d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 5 Sep 2016 16:56:43 +0200 Subject: Make compose form also use normalized data --- app/assets/javascripts/components/reducers/compose.jsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/components/reducers') diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx index abd99ee68..5dd093e9a 100644 --- a/app/assets/javascripts/components/reducers/compose.jsx +++ b/app/assets/javascripts/components/reducers/compose.jsx @@ -1,5 +1,6 @@ -import * as constants from '../actions/compose'; -import Immutable from 'immutable'; +import * as constants from '../actions/compose'; +import { TIMELINE_DELETE } from '../actions/timelines'; +import Immutable from 'immutable'; const initialState = Immutable.Map({ text: '', @@ -13,7 +14,8 @@ export default function compose(state = initialState, action) { return state.set('text', action.text); case constants.COMPOSE_REPLY: return state.withMutations(map => { - map.set('in_reply_to', action.payload).set('text', `@${action.payload.getIn(['account', 'acct'])} `); + map.set('in_reply_to', action.status.get('id')); + map.set('text', `@${action.status.getIn(['account', 'acct'])} `); }); case constants.COMPOSE_REPLY_CANCEL: return state.withMutations(map => { @@ -27,6 +29,12 @@ export default function compose(state = initialState, action) { }); case constants.COMPOSE_SUBMIT_FAIL: return state.set('is_submitting', false); + case TIMELINE_DELETE: + if (action.id === state.get('in_reply_to')) { + return state.set('in_reply_to', null); + } else { + return state; + } default: return state; } -- cgit