From 6a7a36fcddd136d9e1fddf8655520932eac3c2a6 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 30 Dec 2018 18:58:25 +0100 Subject: [PATCH] Immediately go back in browser history upon successfully sending toot (#9663) Avoids possible misleading delay before redirection during which the composer would be cleared and redrawn. --- app/javascript/mastodon/actions/compose.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 1c7f14b5e..a4352faab 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -130,6 +130,12 @@ export function submitCompose(routerHistory) { 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']), }, }).then(function (response) { + if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) { + routerHistory.push('/timelines/direct'); + } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) { + routerHistory.goBack(); + } + dispatch(insertIntoTagHistory(response.data.tags, status)); dispatch(submitComposeSuccess({ ...response.data })); @@ -142,12 +148,6 @@ export function submitCompose(routerHistory) { } }; - if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) { - routerHistory.push('/timelines/direct'); - } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) { - routerHistory.goBack(); - } - if (response.data.visibility !== 'direct') { insertIfOnline('home'); }