Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown

2017-01-09 14:10:32 +01:00
parent 75f80bef10 d64c454cfe
commit 3bddd647e0
6 changed files with 25 additions and 5 deletions
--- a/app/assets/javascripts/components/components/status_action_bar.jsx
+++ b/app/assets/javascripts/components/components/status_action_bar.jsx
@ -49,7 +49,7 @@ const StatusActionBar = React.createClass({
  },

  handleMentionClick () {
-    this.props.onMention(this.props.status.get('account'));
+    this.props.onMention(this.props.status.get('account'), this.context.router);
  },

  handleBlockClick () {