From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Jan 2017 13:18:38 +0000 (+0100)
Subject: Fix compose form bug
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a1de2e332d4406eb0d5934aa22fb96958d291a5f;p=mastodon.git

Fix compose form bug
---

diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 8128bb382..5a76b177b 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -85,7 +85,7 @@ const ComposeForm = React.createClass({
   },
 
   componentDidUpdate (prevProps) {
-    if (!prevProps.in_reply_to || !this.props.in_reply_to || prevProps.in_reply_to.get('id') !== this.props.in_reply_to.get('id')) {
+    if ((!prevProps.in_reply_to && this.props.in_reply_to) || prevProps.in_reply_to.get('id') !== this.props.in_reply_to.get('id')) {
       // If replying to zero or one users, places the cursor at the end of the textbox.
       // If replying to more than one user, selects any usernames past the first;
       // this provides a convenient shortcut to drop everyone else from the conversation.