From 1ea662963f447bd7a1682afb939f8ff3886aa062 Mon Sep 17 00:00:00 2001
From: Isabelle Knott <isabelle@blackle-mori.com>
Date: Wed, 12 Apr 2017 20:15:45 -0400
Subject: [PATCH] Use shift+click instead of alt+click to bypass boost dialog
(#1638)
---
.../javascripts/components/containers/status_container.jsx | 2 +-
app/assets/javascripts/components/features/status/index.jsx | 2 +-
.../components/features/ui/components/boost_modal.jsx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index f92c1cdf44..fedf80fbf4 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -47,7 +47,7 @@ const mapDispatchToProps = (dispatch) => ({
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else {
- if (e.altKey || !this.boostModal) {
+ if (e.shiftKey || !this.boostModal) {
this.onModalReblog(status);
} else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx
index 91302bc3f5..48fea658dd 100644
--- a/app/assets/javascripts/components/features/status/index.jsx
+++ b/app/assets/javascripts/components/features/status/index.jsx
@@ -92,7 +92,7 @@ const Status = React.createClass({
if (status.get('reblogged')) {
this.props.dispatch(unreblog(status));
} else {
- if (e.altKey || !this.props.boostModal) {
+ if (e.shiftKey || !this.props.boostModal) {
this.handleModalReblog(status);
} else {
this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog }));
diff --git a/app/assets/javascripts/components/features/ui/components/boost_modal.jsx b/app/assets/javascripts/components/features/ui/components/boost_modal.jsx
index 023abc6ac2..b54768631c 100644
--- a/app/assets/javascripts/components/features/ui/components/boost_modal.jsx
+++ b/app/assets/javascripts/components/features/ui/components/boost_modal.jsx
@@ -65,7 +65,7 @@ const BoostModal = React.createClass({
</div>
<div className='boost-modal__action-bar'>
- <div><FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Alt + <i className='fa fa-retweet' /></span> }} /></div>
+ <div><FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <i className='fa fa-retweet' /></span> }} /></div>
<Button text={intl.formatMessage(messages.reblog)} onClick={this.handleReblog} />
</div>
</div>
--
GitLab