diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-19 19:58:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 19:58:26 +0200 |
commit | 129bc871a0dc9e49900692a0b88d8d5700d9752a (patch) | |
tree | fcb953a78b12fe126537b2698a3f2b4f1f84dc6a /app | |
parent | 71b760f68091773b47083ffe3393094855e4c9a3 (diff) |
Fix thread column showing pin button (#11891)
Fix #11467
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/components/column_header.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js index 8a26742b5..0038995c8 100644 --- a/app/javascript/mastodon/components/column_header.js +++ b/app/javascript/mastodon/components/column_header.js @@ -120,7 +120,7 @@ class ColumnHeader extends React.PureComponent { <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='text-btn column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' /></button> </div> ); - } else if (multiColumn) { + } else if (multiColumn && this.props.onPin) { pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>; } @@ -142,7 +142,7 @@ class ColumnHeader extends React.PureComponent { collapsedContent.push(pinButton); } - if (children || multiColumn) { + if (children || (multiColumn && this.props.onPin)) { collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><Icon id='sliders' /></button>; } |