diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-07-31 12:06:56 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-31 05:06:56 +0200 |
commit | bb85043f4641adbb4c9589ccd2bd93c9cdd06ce8 (patch) | |
tree | 1bd776ed4c038f7e98ba12af73aff1df9e143f76 /app/javascript/mastodon/reducers/compose.js | |
parent | e1fcad34a9e3c3fd22b3bee66b82d85bd03629fb (diff) |
Disable sensitive button when with content warnings (#4460)
Diffstat (limited to 'app/javascript/mastodon/reducers/compose.js')
-rw-r--r-- | app/javascript/mastodon/reducers/compose.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index 1dd49d41a..e137b774e 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -152,9 +152,13 @@ export default function compose(state = initialState, action) { .set('mounted', false) .set('is_composing', false); case COMPOSE_SENSITIVITY_CHANGE: - return state - .set('sensitive', !state.get('sensitive')) - .set('idempotencyKey', uuid()); + return state.withMutations(map => { + if (!state.get('spoiler')) { + map.set('sensitive', !state.get('sensitive')); + } + + map.set('idempotencyKey', uuid()); + }); case COMPOSE_SPOILERNESS_CHANGE: return state.withMutations(map => { map.set('spoiler_text', ''); |