diff options
author | Nolan Lawson <nolan@nolanlawson.com> | 2017-10-29 08:10:15 -0700 |
---|---|---|
committer | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-10-30 00:10:15 +0900 |
commit | 5e111ce16dcfde66afcd9dcee5f3819ee00cc6bc (patch) | |
tree | 3210da8fda48d6cf3f62988bb4fd7f5b6a7dc8b7 /app/javascript/mastodon/containers/status_container.js | |
parent | 4080569c2dd6d9d8b794cecd4f11492a2f57fcea (diff) |
Reactor unfollow_modal, boost_modal, delete_modal (#5505)
Diffstat (limited to 'app/javascript/mastodon/containers/status_container.js')
-rw-r--r-- | app/javascript/mastodon/containers/status_container.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js index 29eb5f955..13eb0d350 100644 --- a/app/javascript/mastodon/containers/status_container.js +++ b/app/javascript/mastodon/containers/status_container.js @@ -22,6 +22,7 @@ import { muteStatus, unmuteStatus, deleteStatus } from '../actions/statuses'; import { initReport } from '../actions/reports'; import { openModal } from '../actions/modal'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; +import { boostModal, deleteModal } from '../initial_state'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -36,8 +37,6 @@ const makeMapStateToProps = () => { const mapStateToProps = (state, props) => ({ status: getStatus(state, props.id), me: state.getIn(['meta', 'me']), - boostModal: state.getIn(['meta', 'boost_modal']), - deleteModal: state.getIn(['meta', 'delete_modal']), }); return mapStateToProps; @@ -57,7 +56,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ if (status.get('reblogged')) { dispatch(unreblog(status)); } else { - if (e.shiftKey || !this.boostModal) { + if (e.shiftKey || !boostModal) { this.onModalReblog(status); } else { dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog })); @@ -86,7 +85,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, onDelete (status) { - if (!this.deleteModal) { + if (!deleteModal) { dispatch(deleteStatus(status.get('id'))); } else { dispatch(openModal('CONFIRM', { |