From 7fc6213bfe72197b7e8fb4d6b40c4b17ed7c3c6e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 19 Sep 2019 19:58:26 +0200
Subject: [PATCH] [Glitch] Fix thread column showing pin button
Port 129bc871a0dc9e49900692a0b88d8d5700d9752a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---
app/javascript/flavours/glitch/components/column_header.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/flavours/glitch/components/column_header.js b/app/javascript/flavours/glitch/components/column_header.js
index dd70d3c315..43c9f1144c 100644
--- a/app/javascript/flavours/glitch/components/column_header.js
+++ b/app/javascript/flavours/glitch/components/column_header.js
@@ -159,7 +159,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>;
}
@@ -181,7 +181,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>;
}