From aa7a8a30310fc68385d1df7aa20ceca6c2aca497 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 14 Dec 2018 20:35:26 +0100
Subject: [PATCH] When posting in mobile mode, go back to previous history
location (#9502)
Fixes #7112
---
app/javascript/mastodon/actions/compose.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 86d83122f..1c7f14b5e 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -144,7 +144,11 @@ export function submitCompose(routerHistory) {
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
routerHistory.push('/timelines/direct');
- } else if (response.data.visibility !== 'direct') {
+ } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
+ routerHistory.goBack();
+ }
+
+ if (response.data.visibility !== 'direct') {
insertIfOnline('home');
}