gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

4
app/javascript/mastodon/components/column_back_button.jsx
View file

@ -23,9 +23,7 @@ export default class ColumnBackButton extends PureComponent {
if (onClick) {
onClick();
// Check if there is a previous page in the app to go back to per https://stackoverflow.com/a/70532858/9703201
// When upgrading to V6, check `location.key !== 'default'` instead per https://github.com/remix-run/history/blob/main/docs/api-reference.md#location
} else if (router.route.location.key) {
} else if (router.history.location?.state?.fromMastodon) {
router.history.goBack();
} else {
router.history.push('/');