matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor modal settings

Browse Source
This commit is contained in:
Alex Gleason
2020-04-21 14:41:13 -05:00
parent cafa014018
commit 500165c478
6 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/gabsocial/features/status/containers/detailed_status_container.js
View File

@ -27,7 +27,6 @@ import { initMuteModal } from '../../../actions/mutes';
import { initReport } from '../../../actions/reports';
import { openModal } from '../../../actions/modal';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { boostModal, deleteModal } from '../../../initial_state';
import { showAlertForError } from '../../../actions/alerts';
const messages = defineMessages({
@ -74,15 +73,18 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onReblog(status, e) {
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else {
if (e.shiftKey || !boostModal) {
this.onModalReblog(status);
dispatch((_, getState) => {
const boostModal = getState().getIn(['settings', 'boostModal']);
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
if (e.shiftKey || !boostModal) {
this.onModalReblog(status);
} else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
}
}
}
});
},
onFavourite(status) {
@ -109,15 +111,18 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onDelete(status, history, withRedraft = false) {
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), history, withRedraft));
} else {
dispatch(openModal('CONFIRM', {
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
}));
}
dispatch((_, getState) => {
const deleteModal = getState().getIn(['settings', 'deleteModal']);
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), history, withRedraft));
} else {
dispatch(openModal('CONFIRM', {
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
}));
}
});
},
onDirect(account, router) {