Browse Source

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

tags/v2.9.3
ThibG 2 months ago
parent
commit
c8bf30df92
1 changed files with 13 additions and 36 deletions
  1. 13
    36
      app/javascript/mastodon/components/status_content.js

+ 13
- 36
app/javascript/mastodon/components/status_content.js View File

@@ -233,46 +233,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>
);
}
}


Loading…
Cancel
Save