about summary refs log tree commit diff
path: root/app/javascript/mastodon/actions/compose.js
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-09-28 12:37:54 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-09-28 12:37:54 +0200
commitb2dd2e95ad13b31ae58eb23b2b0122519d8bc469 (patch)
treefc32f58b0b8d0919c66267755a097c4e194bdafe /app/javascript/mastodon/actions/compose.js
parenta7f6524c6b052f4d207525c813436ca12c929f00 (diff)
parent6b19e1e632491117bb1d3458fff31cd353b761b7 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/actions/compose.js')
-rw-r--r--app/javascript/mastodon/actions/compose.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 3b3ebcb5b..40d566d24 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -158,7 +158,7 @@ export function submitCompose(routerHistory) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (routerHistory && routerHistory.location.pathname === '/publish' && window.history.state) {
+      if (routerHistory && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new') && window.history.state) {
         routerHistory.goBack();
       }