tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix back button to never go to a different website using history len check

Browse Source
This commit is contained in:
Ondřej Hruška
2017-07-07 08:27:52 +02:00
committed by beatrix
parent 3464bb30f8
commit 7859e6ad45
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/components/column_back_button_slim.js
View File

@@ -9,8 +9,12 @@ export default class ColumnBackButtonSlim extends React.PureComponent {
};
handleClick = () => {
if (window.history && window.history.length === 1) this.context.router.history.push('/');
else this.context.router.history.goBack();
// if history is exhausted, or we would leave mastodon, just go to root.
if (window.history && (window.history.length === 1 || window.history.length === window._mastoInitialHistoryLen)) {
this.context.router.history.push('/');
} else {
this.context.router.history.goBack();
}
}
render () {