mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 22:55:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixed #133 (only parse links in status text)

Browse Source
This commit is contained in:
kibigo! 2017-09-20 00:20:11 -07:00
parent b0487488a7
commit fae8dce738
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/glitch/components/status/content.js
View File

@ -188,7 +188,7 @@ export default class StatusContent extends React.PureComponent {
} }
return ( return (
<div className={classNames} ref={this.setRef}> <div className={classNames}>
<p <p
style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }} style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}
onMouseDown={this.handleMouseDown} onMouseDown={this.handleMouseDown}
@ -205,6 +205,7 @@ export default class StatusContent extends React.PureComponent {
<div className={`status__content__spoiler ${!hidden ? 'status__content__spoiler--visible' : ''}`}> <div className={`status__content__spoiler ${!hidden ? 'status__content__spoiler--visible' : ''}`}>
<div <div
ref={this.setRef}
style={directionStyle} style={directionStyle}
onMouseDown={this.handleMouseDown} onMouseDown={this.handleMouseDown}
onMouseUp={this.handleMouseUp} onMouseUp={this.handleMouseUp}
@ -218,11 +219,11 @@ export default class StatusContent extends React.PureComponent {
} else if (parseClick) { } else if (parseClick) {
return ( return (
<div <div
ref={this.setRef}
className={classNames} className={classNames}
style={directionStyle} style={directionStyle}
> >
<div <div
ref={this.setRef}
onMouseDown={this.handleMouseDown} onMouseDown={this.handleMouseDown}
onMouseUp={this.handleMouseUp} onMouseUp={this.handleMouseUp}
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
@ -233,11 +234,10 @@ export default class StatusContent extends React.PureComponent {
} else { } else {
return ( return (
<div <div
ref={this.setRef}
className='status__content' className='status__content'
style={directionStyle} style={directionStyle}
> >
<div dangerouslySetInnerHTML={content} /> <div ref={this.setRef} dangerouslySetInnerHTML={content} />
{media} {media}
</div> </div>
); );