From 889709a2a63fda16b1c8919faa9070a316ce9b57 Mon Sep 17 00:00:00 2001 From: blackle Date: Mon, 16 Jan 2017 10:23:45 -0500 Subject: Show 'do not display in public timeline' when replying to self --- .../components/features/compose/components/compose_form.jsx | 5 ++++- .../features/compose/containers/compose_form_container.jsx | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'app/assets') 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 9659cf61b..80cb38e16 100644 --- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx +++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx @@ -32,6 +32,7 @@ const ComposeForm = React.createClass({ is_uploading: React.PropTypes.bool, in_reply_to: ImmutablePropTypes.map, media_count: React.PropTypes.number, + me: React.PropTypes.number, onChange: React.PropTypes.func.isRequired, onSubmit: React.PropTypes.func.isRequired, onCancelReply: React.PropTypes.func.isRequired, @@ -110,6 +111,8 @@ const ComposeForm = React.createClass({ replyArea = ; } + let reply_to_other = !!this.props.in_reply_to && (this.props.in_reply_to.getIn(['account', 'id']) !== this.props.me); + return (
{replyArea} @@ -139,7 +142,7 @@ const ComposeForm = React.createClass({ - + {({ opacity, height }) =>