diff options
author | Neil Moore <dar13.dev@gmail.com> | 2019-05-26 07:48:45 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-26 13:48:45 +0200 |
commit | 63483ee543eb6c81e2cf6450a682cdb657e92751 (patch) | |
tree | bd1a37da0b732bd3fcc991efef19ae3ea68c2530 /app | |
parent | 988342a56cb58da9ac660eec3e55c3bcbbd6269b (diff) |
Create new click handler for status__expand area in status (#10837)
This click handler only activates on left-click, resolving #10798. This matches behavior in status_content.js, as added in #536
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/components/status.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 2d3a32d62..b67354b01 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -166,6 +166,17 @@ class Status extends ImmutablePureComponent { this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'id'], status.get('id'))}`); } + handleExpandClick = (e) => { + if (e.button === 0) { + if (!this.context.router) { + return; + } + + const { status } = this.props; + this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'id'], status.get('id'))}`); + } + } + handleAccountClick = (e) => { if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) { const id = e.currentTarget.getAttribute('data-id'); @@ -395,7 +406,7 @@ class Status extends ImmutablePureComponent { {prepend} <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted, read: unread === false })} data-id={status.get('id')}> - <div className='status__expand' onClick={this.handleClick} role='presentation' /> + <div className='status__expand' onClick={this.handleExpandClick} role='presentation' /> <div className='status__info'> <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a> |