mastofe

commit: 88801f7554edda4d0d0a2403d841edef55443ab8
parent: f63f0c46253f8d3c5524645160cbfe0c70cdec2f
Author: Eugen <eugen@zeonfederated.com>
Date:   Sat, 14 Jan 2017 20:33:10 +0100

Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies

Hide 'Do not display on public timeline' for reply toots
Diffstat:
M
app/assets/javascripts/components/features/compose/components/compose_form.jsx
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -139,7 +139,7 @@ const ComposeForm = React.createClass({
           <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.private' defaultMessage='Mark as private' /></span>
         </label>
 
-        <Motion defaultStyle={{ opacity: this.props.private ? 0 : 100, height: this.props.private ? 39.5 : 0 }} style={{ opacity: spring(this.props.private ? 0 : 100), height: spring(this.props.private ? 0 : 39.5) }}>
+        <Motion defaultStyle={{ opacity: (this.props.private || this.props.in_reply_to) ? 0 : 100, height: (this.props.private || this.props_in_reply_to) ? 39.5 : 0 }} style={{ opacity: spring((this.props.private || this.props.in_reply_to) ? 0 : 100), height: spring((this.props.private || this.props_in_reply_to) ? 0 : 39.5) }}>
           {({ opacity, height }) =>
             <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
               <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />