]> cat aescling's git repositories - mastodon.git/commitdiff
Fix regression where CW is focused on reply (#7811)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 15 Jun 2018 17:49:32 +0000 (19:49 +0200)
committerGitHub <noreply@github.com>
Fri, 15 Jun 2018 17:49:32 +0000 (19:49 +0200)
app/javascript/mastodon/features/compose/components/compose_form.js

index 83f2f4d342e79510908a685c6a54e71f7d4aa9f3..6eb01123e46da95dcc0c5d68f3bd9b168b7a525f 100644 (file)
@@ -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 {