From 9349f1067a99c45648dc66f397b338d458d1a763 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 28 Jul 2019 13:48:05 +0200
Subject: [PATCH] Fix animate on hover in poll options without CW (#11404)
---
.../mastodon/components/status_content.js | 49 +++++--------------
1 file changed, 13 insertions(+), 36 deletions(-)
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 871fab2dcf..549de95fc1 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -234,46 +234,23 @@ export default class StatusContent extends React.PureComponent {
</div>
);
} else if (this.props.onClick) {
- const output = [
- <div
- ref={this.setRef}
- tabIndex='0'
- key='content'
- className={classNames}
- style={directionStyle}
- dangerouslySetInnerHTML={content}
- lang={status.get('language')}
- onMouseDown={this.handleMouseDown}
- onMouseUp={this.handleMouseUp}
- />,
- ];
-
- if (this.state.collapsed) {
- output.push(readMoreButton);
- }
+ return (
+ <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')} />
- if (status.get('poll')) {
- output.push(<PollContainer pollId={status.get('poll')} />);
- }
+ {!!this.state.collapsed && readMoreButton}
- return output;
+ {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+ </div>
+ );
} else {
- const output = [
- <div
- tabIndex='0'
- ref={this.setRef}
- className='status__content'
- style={directionStyle}
- dangerouslySetInnerHTML={content}
- lang={status.get('language')}
- />,
- ];
-
- if (status.get('poll')) {
- output.push(<PollContainer pollId={status.get('poll')} />);
- }
+ return (
+ <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>
+ <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
- return output;
+ {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+ </div>
+ );
}
}
--
GitLab