Merge branch 'glitch'

1 files changed, 11 insertions, 1 deletions

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
index 436c2df0a..6302f11af 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
@@ -29,7 +29,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
   };
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
@@ -37,6 +37,15 @@ export default class DetailedStatus extends ImmutablePureComponent {
     e.stopPropagation();
   }
 
+  parseClick = (e, destination) => {
+    if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey)) {
+      e.preventDefault();
+      this.context.router.history.push(destination);
+    }
+
+    e.stopPropagation();
+  }
+
   handleOpenVideo = (media, startTime) => {
     this.props.onOpenVideo(media, startTime);
   }
@@ -122,6 +131,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
           expanded={expanded}
           collapsed={false}
           onExpandedToggle={onToggleHidden}
+          parseClick={this.parseClick}
         />
 
         <div className='detailed-status__meta'>