Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 20:09:05 +02:00
parent fc6d27daf3 5bcd98172c
commit 7778de467c
2 changed files with 6 additions and 1 deletions
--- 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;