Fix animate on hover in poll options without CW (#11404)

master
ThibG 5 years ago committed by Eugen Rochko
parent 6a1f08d29a
commit 9349f1067a
  1. 49
      app/javascript/mastodon/components/status_content.js

@ -234,46 +234,23 @@ export default class StatusContent extends React.PureComponent {
</div> </div>
); );
} else if (this.props.onClick) { } else if (this.props.onClick) {
const output = [ return (
<div <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
ref={this.setRef} <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
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);
}
if (status.get('poll')) { {!!this.state.collapsed && readMoreButton}
output.push(<PollContainer pollId={status.get('poll')} />);
}
return output; {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
</div>
);
} else { } else {
const output = [ return (
<div <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>
tabIndex='0' <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
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 output; {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
</div>
);
} }
} }

Loading…
Cancel
Save