From 025fbb8285cdedf495d9e4d015db611b0c622cbb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 19 Aug 2018 03:17:01 +0200
Subject: [PATCH] Show compose form on delete & redraft when in mobile layout
(#8277)
Fix #8274
---
app/javascript/mastodon/actions/statuses.js | 6 +++++-
app/javascript/mastodon/components/status_action_bar.js | 4 ++--
app/javascript/mastodon/containers/status_container.js | 6 +++---
.../mastodon/features/status/components/action_bar.js | 4 ++--
app/javascript/mastodon/features/status/index.js | 6 +++---
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3e1e5f2709..8d5e72beca 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -140,7 +140,7 @@ export function redraft(status) {
};
};
-export function deleteStatus(id, withRedraft = false) {
+export function deleteStatus(id, router, withRedraft = false) {
return (dispatch, getState) => {
const status = getState().getIn(['statuses', id]);
@@ -153,6 +153,10 @@ export function deleteStatus(id, withRedraft = false) {
if (withRedraft) {
dispatch(redraft(status));
+
+ if (!getState().getIn(['compose', 'mounted'])) {
+ router.push('/statuses/new');
+ }
}
}).catch(error => {
dispatch(deleteStatusFail(id, error));
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index c799d4e986..6d44a4b451 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -96,11 +96,11 @@ export default class StatusActionBar extends ImmutablePureComponent {
}
handleDeleteClick = () => {
- this.props.onDelete(this.props.status);
+ this.props.onDelete(this.props.status, this.context.router.history);
}
handleRedraftClick = () => {
- this.props.onDelete(this.props.status, true);
+ this.props.onDelete(this.props.status, this.context.router.history, true);
}
handlePinClick = () => {
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index eb6329fdcd..ed375c3e52 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -93,14 +93,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
}));
},
- onDelete (status, withRedraft = false) {
+ onDelete (status, history, withRedraft = false) {
if (!deleteModal) {
- dispatch(deleteStatus(status.get('id'), withRedraft));
+ 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'), withRedraft)),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
}));
}
},
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 5414996681..f5977c02cd 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -65,11 +65,11 @@ export default class ActionBar extends React.PureComponent {
}
handleDeleteClick = () => {
- this.props.onDelete(this.props.status);
+ this.props.onDelete(this.props.status, this.context.router.history);
}
handleRedraftClick = () => {
- this.props.onDelete(this.props.status, true);
+ this.props.onDelete(this.props.status, this.context.router.history, true);
}
handleDirectClick = () => {
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 0ffeaa4dc1..e506733b40 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -174,16 +174,16 @@ export default class Status extends ImmutablePureComponent {
}
}
- handleDeleteClick = (status, withRedraft = false) => {
+ handleDeleteClick = (status, history, withRedraft = false) => {
const { dispatch, intl } = this.props;
if (!deleteModal) {
- dispatch(deleteStatus(status.get('id'), withRedraft));
+ 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'), withRedraft)),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
}));
}
}
--
GitLab