nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #1097 When onClick is falsy, do not make status content clickable (#1434)

This commit is contained in:
Stephen Burgess 2017-04-10 14:31:26 -05:00 committed by Eugen
parent 8a6096a3de
commit 553170b77a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/components/components/status_content.jsx
View File

@ -125,7 +125,7 @@ const StatusContent = React.createClass({
<div style={{ display: hidden ? 'none' : 'block', ...directionStyle }} dangerouslySetInnerHTML={content} /> <div style={{ display: hidden ? 'none' : 'block', ...directionStyle }} dangerouslySetInnerHTML={content} />
</div> </div>
); );
} else { } else if (this.props.onClick) {
return ( return (
<div <div
className='status__content' className='status__content'
@ -135,6 +135,14 @@ const StatusContent = React.createClass({
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
/> />
); );
} else {
return (
<div
className='status__content'
style={{ ...directionStyle }}
dangerouslySetInnerHTML={content}
/>
);
} }
}, },