From d126240129681c64063f7f339eba55c105a94082 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 30 Dec 2018 13:53:39 +0100 Subject: [PATCH] Immediately go back in browser history upon successfully sending toot --- app/javascript/flavours/glitch/actions/compose.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js index d53d269249c..71d3fb1b238 100644 --- a/app/javascript/flavours/glitch/actions/compose.js +++ b/app/javascript/flavours/glitch/actions/compose.js @@ -142,6 +142,12 @@ export function submitCompose(routerHistory) { 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']), }, }).then(function (response) { + if (routerHistory && routerHistory.location.pathname === '/statuses/new' + && window.history.state + && !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) { + routerHistory.goBack(); + } + dispatch(insertIntoTagHistory(response.data.tags, status)); dispatch(submitComposeSuccess({ ...response.data })); @@ -158,12 +164,6 @@ export function submitCompose(routerHistory) { } }; - if (routerHistory && routerHistory.location.pathname === '/statuses/new' - && window.history.state - && !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) { - routerHistory.goBack(); - } - insertIfOnline('home'); if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {