Merge pull request #660 from marrus-sh/mastodon-smart-back-button

#467 – Making the back button a little smarter
2017-03-01 10:50:27 +01:00 · 2017-03-01 10:50:27 +01:00 · 0924eee81b
parent 5960bac11e 5f6f7aaa27
commit 0924eee81b
1 changed files with 2 additions and 1 deletions
--- a/app/assets/javascripts/components/components/column_back_button.jsx
+++ b/app/assets/javascripts/components/components/column_back_button.jsx
@ -15,7 +15,8 @@ const ColumnBackButton = React.createClass({
  mixins: [PureRenderMixin],

  handleClick () {
-    this.context.router.goBack();
+    if (window.history && window.history.length == 1) this.context.router.push("/");
+    else this.context.router.goBack();
  },

  render () {