ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use shift+click instead of alt+click to bypass boost dialog (#1638)

rebase/4.0.0rc2
Isabelle Knott 2017-04-12 20:15:45 -04:00 committed by Eugen
parent bd834add56
commit 1ea662963f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ const mapDispatchToProps = (dispatch) => ({
if (status.get('reblogged')) { if (status.get('reblogged')) {
dispatch(unreblog(status)); dispatch(unreblog(status));
} else { } else {
if (e.altKey || !this.boostModal) { if (e.shiftKey || !this.boostModal) {
this.onModalReblog(status); this.onModalReblog(status);
} else { } else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog })); dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));

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

@ -92,7 +92,7 @@ const Status = React.createClass({
if (status.get('reblogged')) { if (status.get('reblogged')) {
this.props.dispatch(unreblog(status)); this.props.dispatch(unreblog(status));
} else { } else {
if (e.altKey || !this.props.boostModal) { if (e.shiftKey || !this.props.boostModal) {
this.handleModalReblog(status); this.handleModalReblog(status);
} else { } else {
this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog })); this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog }));

2
app/assets/javascripts/components/features/ui/components/boost_modal.jsx
View File

@ -65,7 +65,7 @@ const BoostModal = React.createClass({
</div> </div>
<div className='boost-modal__action-bar'> <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} /> <Button text={intl.formatMessage(messages.reblog)} onClick={this.handleReblog} />
</div> </div>
</div> </div>