From a9303e70627c1e79f73f0e37eafe7857df6d5533 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 25 Mar 2017 19:30:56 +0100 Subject: When replying to status with content warning, prefill content warning --- app/assets/javascripts/components/reducers/compose.jsx | 7 +++++++ 1 file changed, 7 insertions(+) (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 a5deae930..4470ad643 100644 --- a/app/assets/javascripts/components/reducers/compose.jsx +++ b/app/assets/javascripts/components/reducers/compose.jsx @@ -152,11 +152,18 @@ export default function compose(state = initialState, action) { map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy'))); map.set('focusDate', new Date()); map.set('preselectDate', new Date()); + + if (action.status.get('spoiler_text').length > 0) { + map.set('spoiler', true); + map.set('spoiler_text', action.status.get('spoiler_text')); + } }); case COMPOSE_REPLY_CANCEL: return state.withMutations(map => { map.set('in_reply_to', null); map.set('text', ''); + map.set('spoiler', false); + map.set('spoiler_text', ''); map.set('privacy', state.get('default_privacy')); }); case COMPOSE_SUBMIT_REQUEST: -- cgit