cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Bypass boost confirm modal if alt is pressed

This commit is contained in:
blackle 2017-04-11 08:34:14 -04:00
parent 01e5447e35
commit f53fb6aa66
5 changed files with 17 additions and 9 deletions
Show Stats 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);
}
},

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 () {

6
app/assets/javascripts/components/containers/status_container.jsx
View File

@ -42,12 +42,16 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(reblog(status));
},
onReblog (status) {
onReblog (status, e) {
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else {
if (e.altKey) {
this.onModalReblog(status);
} else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
}
}
},
onFavourite (status) {

4
app/assets/javascripts/components/features/status/components/action_bar.jsx
View File

@ -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 () {

6
app/assets/javascripts/components/features/status/index.jsx
View File

@ -86,12 +86,16 @@ const Status = React.createClass({
this.props.dispatch(reblog(status));
},
handleReblogClick (status) {
handleReblogClick (status, e) {
if (status.get('reblogged')) {
this.props.dispatch(unreblog(status));
} else {
if (e.altKey) {
this.handleModalReblog(status);
} else {
this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog }));
}
}
},
handleDeleteClick (status) {