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

2017-04-11 20:43:56 +02:00
parent b723ee73fc 06444bf050
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions
--- a/app/assets/javascripts/components/features/status/components/action_bar.jsx
+++ b/app/assets/javascripts/components/features/status/components/action_bar.jsx
@ -37,8 +37,8 @@ const ActionBar = React.createClass({
    this.props.onReply(this.props.status);
  },

-  handleReblogClick () {
-    this.props.onReblog(this.props.status);
+  handleReblogClick (e) {
+    this.props.onReblog(this.props.status, e);
  },

  handleFavouriteClick () {