gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Do not leave Mastodon when clicking “Back” (#23953)

gh/stable
Christian Schmidt 2023-03-04 23:18:19 +01:00 committed by Claire
parent 4cec3ad9b8
commit 37a28ba203
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/components/column_back_button.js
View File

@ -15,10 +15,10 @@ export default class ColumnBackButton extends React.PureComponent {
}; };
handleClick = () => { handleClick = () => {
if (window.history && window.history.length === 1) { if (window.history && window.history.state) {
this.context.router.history.push('/');
} else {
this.context.router.history.goBack(); this.context.router.history.goBack();
} else {
this.context.router.history.push('/');
} }
}; };

14
app/javascript/mastodon/components/column_header.js
View File

@ -43,14 +43,6 @@ class ColumnHeader extends React.PureComponent {
animating: false, animating: false,
}; };
historyBack = () => {
if (window.history && window.history.length === 1) {
this.context.router.history.push('/');
} else {
this.context.router.history.goBack();
}
};
handleToggleClick = (e) => { handleToggleClick = (e) => {
e.stopPropagation(); e.stopPropagation();
this.setState({ collapsed: !this.state.collapsed, animating: true }); this.setState({ collapsed: !this.state.collapsed, animating: true });
@ -69,7 +61,11 @@ class ColumnHeader extends React.PureComponent {
}; };
handleBackClick = () => { handleBackClick = () => {
this.historyBack(); if (window.history && window.history.state) {
this.context.router.history.goBack();
} else {
this.context.router.history.push('/');
}
}; };
handleTransitionEnd = () => { handleTransitionEnd = () => {

6
app/javascript/mastodon/features/ui/index.js
View File

@ -474,10 +474,10 @@ class UI extends React.PureComponent {
}; };
handleHotkeyBack = () => { handleHotkeyBack = () => {
if (window.history && window.history.length === 1) { if (window.history && window.history.state) {
this.context.router.history.push('/');
} else {
this.context.router.history.goBack(); this.context.router.history.goBack();
} else {
this.context.router.history.push('/');
} }
}; };