gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2017-04-11 20:43:56 +02:00
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/components/icon_button.jsx
View file

@ -31,7 +31,7 @@ const IconButton = React.createClass({
e.preventDefault();
if (!this.props.disabled) {
this.props.onClick();
this.props.onClick(e);
}
},

1
app/assets/javascripts/components/components/status.jsx
View file

@ -27,6 +27,7 @@ const Status = React.createClass({
onOpenMedia: React.PropTypes.func,
onBlock: React.PropTypes.func,
me: React.PropTypes.number,
boostModal: React.PropTypes.bool,
muted: React.PropTypes.bool
},

4
app/assets/javascripts/components/components/status_action_bar.jsx
View file

@ -46,8 +46,8 @@ const StatusActionBar = React.createClass({
this.props.onFavourite(this.props.status);
},
handleReblogClick () {
this.props.onReblog(this.props.status);
handleReblogClick (e) {
this.props.onReblog(this.props.status, e);
},
handleDeleteClick () {