From f53fb6aa660834074bbbffac5b1fe5ea0cc85edf Mon Sep 17 00:00:00 2001
From: blackle <isabelle@blackle-mori.com>
Date: Tue, 11 Apr 2017 08:34:14 -0400
Subject: [PATCH] Bypass boost confirm modal if alt is pressed
---
.../javascripts/components/components/icon_button.jsx | 2 +-
.../components/components/status_action_bar.jsx | 4 ++--
.../components/containers/status_container.jsx | 8 ++++++--
.../components/features/status/components/action_bar.jsx | 4 ++--
.../javascripts/components/features/status/index.jsx | 8 ++++++--
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/app/assets/javascripts/components/components/icon_button.jsx b/app/assets/javascripts/components/components/icon_button.jsx
index a08b1159b1..33835f9a05 100644
--- a/app/assets/javascripts/components/components/icon_button.jsx
+++ b/app/assets/javascripts/components/components/icon_button.jsx
@@ -31,7 +31,7 @@ const IconButton = React.createClass({
e.preventDefault();
if (!this.props.disabled) {
- this.props.onClick();
+ this.props.onClick(e);
}
},
diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx
index 4ebb76ea75..02424e77c5 100644
--- a/app/assets/javascripts/components/components/status_action_bar.jsx
+++ b/app/assets/javascripts/components/components/status_action_bar.jsx
@@ -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 () {
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index 918fb91a02..02746cc792 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -42,11 +42,15 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(reblog(status));
},
- onReblog (status) {
+ onReblog (status, e) {
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else {
- dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
+ if (e.altKey) {
+ this.onModalReblog(status);
+ } else {
+ dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
+ }
}
},
diff --git a/app/assets/javascripts/components/features/status/components/action_bar.jsx b/app/assets/javascripts/components/features/status/components/action_bar.jsx
index 2aebcd7098..fdcb8b9806 100644
--- 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 () {
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx
index 8b5019b576..94ccaf535f 100644
--- a/app/assets/javascripts/components/features/status/index.jsx
+++ b/app/assets/javascripts/components/features/status/index.jsx
@@ -86,11 +86,15 @@ const Status = React.createClass({
this.props.dispatch(reblog(status));
},
- handleReblogClick (status) {
+ handleReblogClick (status, e) {
if (status.get('reblogged')) {
this.props.dispatch(unreblog(status));
} 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 }));
+ }
}
},
--
GitLab