about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-06-26 15:41:09 -0700
committerkibigo! <marrus-sh@users.noreply.github.com>2017-06-26 15:41:09 -0700
commit59503a88ae96f554eab3c33f5760e98808ee135a (patch)
treeb266108fa1457061dcbd2491bd19cfdae5cfe258 /app/javascript
parent5df7bc3a8bee95a751e7d55b2513653a2e1e9a4e (diff)
Disable account linking on collapsed toots too
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/components/status.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index cbbd831e7..0077a9191 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -169,7 +169,8 @@ class StatusUnextended extends ImmutablePureComponent {
     if (e.button === 0) {
       const id = Number(e.currentTarget.getAttribute('data-id'));
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${id}`);
+      if (this.state.isCollapsed) this.handleCollapsedClick();
+      else this.context.router.history.push(`/accounts/${id}`);
     }
   }