astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/11424/head
ThibG 2019-07-28 13:48:05 +02:00 committed by Eugen Rochko
parent 6a1f08d29a
commit 9349f1067a
1 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/javascript/mastodon/components/status_content.js
View File

@ -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) { {!!this.state.collapsed && readMoreButton}
output.push(readMoreButton);
}
if (status.get('poll')) { {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
output.push(<PollContainer pollId={status.get('poll')} />); </div>
} );
return output;
} 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')) { {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
output.push(<PollContainer pollId={status.get('poll')} />); </div>
} );
return output;
} }
} }