Browse Source

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.
master
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
6a7a36fcdd
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      app/javascript/mastodon/actions/compose.js

+ 6
- 6
app/javascript/mastodon/actions/compose.js View File

@@ -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');
}


Loading…
Cancel
Save