From fd0104369102cbc89e5fb42e41e36d4b233d4603 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 8 Aug 2019 17:05:50 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cread=20more=E2=80=9D=20button=20?=
=?UTF-8?q?behing=20hidden=20(regression=20from=20#11404)=20(#11522)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix “read more” button behing hidden (regression from #11404)
This has the side-effect of putting the “Read more” button below possibly
trunctated polls instead of putting the poll below the “Read more”
* Remove dead code
---
.../mastodon/components/status_content.js | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 76117f1d9..6aa0bfcc2 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -166,11 +166,6 @@ export default class StatusContent extends React.PureComponent {
}
}
- handleCollapsedClick = (e) => {
- e.preventDefault();
- this.setState({ collapsed: !this.state.collapsed });
- }
-
setRef = (c) => {
this.node = c;
}
@@ -234,15 +229,19 @@ export default class StatusContent extends React.PureComponent {
</div>
);
} else if (this.props.onClick) {
- return (
+ const output = [
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
- {!!this.state.collapsed && readMoreButton}
-
{!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
- </div>
- );
+ </div>,
+ ];
+
+ if (this.state.collapsed) {
+ output.push(readMoreButton);
+ }
+
+ return output;
} else {
return (
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>