about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-06-15 19:49:32 +0200
committerGitHub <noreply@github.com>2018-06-15 19:49:32 +0200
commit09147186b79f80cf3ef3aa8ba7e6e5e032faa255 (patch)
treea41779de551c0af9705e803e186969fb0b6a6065 /app/javascript
parent53f0452b70445831664431ef7720d8ec2d361656 (diff)
Fix regression where CW is focused on reply (#7811)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/compose/components/compose_form.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 83f2f4d34..6eb01123e 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -127,9 +127,7 @@ export default class ComposeForm extends ImmutablePureComponent {
       this.autosuggestTextarea.textarea.focus();
     } else if(prevProps.is_submitting && !this.props.is_submitting) {
       this.autosuggestTextarea.textarea.focus();
-    }
-
-    if (this.props.spoiler !== prevProps.spoiler) {
+    } else if (this.props.spoiler !== prevProps.spoiler) {
       if (this.props.spoiler) {
         this.spoilerText.focus();
       } else {