Merge branch 'delete-redraft' into 'develop'
Fix "delete & redraft" to pop up modal, fixes #71 Closes #71 See merge request gab/social/gab-social!39
This commit is contained in:
commit
3e43d062ca
@ -4,6 +4,7 @@ import { evictStatus } from '../storage/modifier';
|
|||||||
import { deleteFromTimelines } from './timelines';
|
import { deleteFromTimelines } from './timelines';
|
||||||
import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
|
import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
|
||||||
import { ensureComposeIsVisible } from './compose';
|
import { ensureComposeIsVisible } from './compose';
|
||||||
|
import { openModal, closeModal } from './modal';
|
||||||
import { me } from 'gabsocial/initial_state';
|
import { me } from 'gabsocial/initial_state';
|
||||||
|
|
||||||
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
|
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
|
||||||
@ -159,7 +160,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
|
|||||||
|
|
||||||
if (withRedraft) {
|
if (withRedraft) {
|
||||||
dispatch(redraft(status, response.data.text));
|
dispatch(redraft(status, response.data.text));
|
||||||
ensureComposeIsVisible(getState, routerHistory);
|
dispatch(openModal('COMPOSE'));
|
||||||
}
|
}
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(deleteStatusFail(id, error));
|
dispatch(deleteStatusFail(id, error));
|
||||||
|
Loading…
Reference in New Issue
Block a user