diff options
author | ThibG <thib@sitedethib.com> | 2018-12-14 20:35:26 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-14 20:35:26 +0100 |
commit | aa7a8a30310fc68385d1df7aa20ceca6c2aca497 (patch) | |
tree | e6611841bd13271941cc82025b335befff1c666e /app | |
parent | 7c48688d85d0ab64501cea6b8a516867a786bb4c (diff) |
When posting in mobile mode, go back to previous history location (#9502)
Fixes #7112
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/actions/compose.js | 6 |
1 files changed, 5 insertions, 1 deletions
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'); } |