diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-14 20:33:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 20:33:10 +0100 |
| commit | 88801f7554edda4d0d0a2403d841edef55443ab8 (patch) | |
| tree | f37947a0c46a674d2b51c8e3f83f8ae7782d2158 /app/assets | |
| parent | f63f0c46253f8d3c5524645160cbfe0c70cdec2f (diff) | |
| parent | 32d756fb221a10e6ef7feaa5039d98849356f913 (diff) | |
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 (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/features/compose/components/compose_form.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
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 078bfbdc6..b9f90c569 100644 --- 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} /> |