diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-18 18:22:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 18:22:54 +0200 |
| commit | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/javascript/mastodon/features/status/components/detailed_status.js | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (diff) | |
Merge pull request #649 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/features/status/components/detailed_status.js')
| -rw-r--r-- | app/javascript/mastodon/features/status/components/detailed_status.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js index 417719004..12ffb7579 100644 --- a/app/javascript/mastodon/features/status/components/detailed_status.js +++ b/app/javascript/mastodon/features/status/components/detailed_status.js @@ -26,7 +26,7 @@ export default class DetailedStatus extends ImmutablePureComponent { }; handleAccountClick = (e) => { - if (e.button === 0) { + if (e.button === 0 && !(e.ctrlKey || e.metaKey)) { e.preventDefault(); this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`); } |