Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix “Back” button sometimes redirecting out of Mastodon (#25281)

Browse source
This commit is contained in:
Claire 2023-07-17 17:32:46 +02:00 • committed by GitHub
parent d0f00206dc
commit a442a1d1c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/features/ui/index.jsx
View file

@ -479,10 +479,12 @@ class UI extends PureComponent {
};
handleHotkeyBack = () => {
if (window.history && window.history.state) {
this.context.router.history.goBack();
const { router } = this.context;
if (router.history.location?.state?.fromMastodon) {
router.history.goBack();
} else {
this.context.router.history.push('/');
router.history.push('/');
}
};