diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-29 23:39:57 -0700 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-29 23:39:57 -0700 |
commit | b525caf40ac5e5332ff82042a6d9062d6f281688 (patch) | |
tree | 56b065963152c067dbf1e407aa43e11f5ea49fb7 | |
parent | fc65b691df3c1a0a9635ae337fd163c5336f87ce (diff) |
Fixing an aspect of #32 which had previously escaped my attention
-rw-r--r-- | app/javascript/mastodon/components/status_content.js | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index 6528337ae..c60d4f5a5 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -148,8 +148,12 @@ export default class StatusContent extends React.PureComponent { } return ( - <div className='status__content status__content--with-action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> - <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}> + <div className='status__content status__content--with-action' ref={this.setRef}> + <p + style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }} + onMouseDown={this.handleMouseDown} + onMouseUp={this.handleMouseUp} + > <span dangerouslySetInnerHTML={spoilerContent} /> {' '} <button tabIndex='0' className='status__content__spoiler-link' onClick={this.handleSpoilerClick}> @@ -160,11 +164,13 @@ export default class StatusContent extends React.PureComponent { {mentionsPlaceholder} <div className={`status__content__spoiler ${!hidden ? 'status__content__spoiler--visible' : ''}`}> - - <div style={directionStyle} dangerouslySetInnerHTML={content} /> - + <div + style={directionStyle} + onMouseDown={this.handleMouseDown} + onMouseUp={this.handleMouseUp} + dangerouslySetInnerHTML={content} + /> {children} - </div> </div> |