about summary refs log tree commit diff
path: root/app/assets/javascripts/components/containers
diff options
context:
space:
mode:
authorblackle <isabelle@blackle-mori.com>2017-04-11 10:10:16 -0400
committerblackle <isabelle@blackle-mori.com>2017-04-11 10:10:16 -0400
commit06444bf050a267da7001c2801480c5fae3e1559e (patch)
tree4dd809131a514dac055bcc7abd038fcbf638669f /app/assets/javascripts/components/containers
parentf53fb6aa660834074bbbffac5b1fe5ea0cc85edf (diff)
Allow user to disable the boost confirm dialog in preferences
Diffstat (limited to 'app/assets/javascripts/components/containers')
-rw-r--r--app/assets/javascripts/components/containers/status_container.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index 02746cc79..f92c1cdf4 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -26,7 +26,8 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, props) => ({
     status: getStatus(state, props.id),
-    me: state.getIn(['meta', 'me'])
+    me: state.getIn(['meta', 'me']),
+    boostModal: state.getIn(['meta', 'boost_modal'])
   });
 
   return mapStateToProps;
@@ -46,7 +47,7 @@ const mapDispatchToProps = (dispatch) => ({
     if (status.get('reblogged')) {
       dispatch(unreblog(status));
     } else {
-      if (e.altKey) {
+      if (e.altKey || !this.boostModal) {
         this.onModalReblog(status);
       } else {
         dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));