about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-10 20:09:05 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-10 20:09:05 +0200
commit7778de467cd35fa4a514dd97ced0d19675f3b9d9 (patch)
treec8048db1bc718663c5ed33c8b225544d5e37f98b /app/javascript
parentfc6d27daf39ca136b0e3e09e7572c5c46086ad72 (diff)
parent5bcd98172c2d0ec4827e396a3648eb1e94634c55 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/components/status.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index a795b8ce9..aa5e870dc 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -171,6 +171,11 @@ class Status extends ImmutablePureComponent {
   }
 
   handleExpandClick = (e) => {
+    if (this.props.onClick) {
+      this.props.onClick();
+      return;
+    }
+
     if (e.button === 0) {
       if (!this.context.router) {
         return;