about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-03 16:16:05 +0100
committerThibG <thib@sitedethib.com>2018-12-06 15:31:21 +0100
commit4167ed375bd9402e91a998fad8f173fa76b2eec3 (patch)
treea41e0d840a1ff5fedc9c375e3e8e3e7a4597e464 /app/javascript/flavours
parentfe9340d95e9ae9a1870e9951e9b00ad5df4cc257 (diff)
Fix mention links in detailed statuses not opening in the WebUI
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r--app/javascript/flavours/glitch/features/status/components/detailed_status.js12
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'>