treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Bypass boost confirm modal if alt is pressed

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
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(); e.preventDefault();
if (!this.props.disabled) { 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); this.props.onFavourite(this.props.status);
}, },
handleReblogClick () { handleReblogClick (e) {
this.props.onReblog(this.props.status); this.props.onReblog(this.props.status, e);
}, },
handleDeleteClick () { handleDeleteClick () {

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

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

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); this.props.onReply(this.props.status);
}, },
handleReblogClick () { handleReblogClick (e) {
this.props.onReblog(this.props.status); this.props.onReblog(this.props.status, e);
}, },
handleFavouriteClick () { handleFavouriteClick () {

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

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