From 17ac82385a66da69d74a4dbdba5a52eef81501c4 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Tue, 11 Nov 2014 17:01:13 +0100 Subject: [PATCH] Fixed: Switching tabs in Activity and Wanted no longer add to navigation history, just like Settings, preventing a redirect loop when using the browser back navigation. --- src/UI/Activity/ActivityLayout.js | 2 +- src/UI/Settings/SettingsLayout.js | 2 +- src/UI/System/SystemLayout.js | 2 +- src/UI/Wanted/WantedLayout.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UI/Activity/ActivityLayout.js b/src/UI/Activity/ActivityLayout.js index 97fd4e7b3..52513f11a 100644 --- a/src/UI/Activity/ActivityLayout.js +++ b/src/UI/Activity/ActivityLayout.js @@ -49,7 +49,7 @@ define( }, _navigate: function (route) { - Backbone.history.navigate(route); + Backbone.history.navigate(route, { trigger: false, replace: true }); }, _showHistory: function (e) { diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js index 8d39eaaa1..791af62a0 100644 --- a/src/UI/Settings/SettingsLayout.js +++ b/src/UI/Settings/SettingsLayout.js @@ -254,7 +254,7 @@ define( this._navigate('settings/ui'); }, - _navigate:function(route){ + _navigate: function (route) { Backbone.history.navigate(route, { trigger: false, replace: true }); }, diff --git a/src/UI/System/SystemLayout.js b/src/UI/System/SystemLayout.js index 08fe635ca..c89b2663e 100644 --- a/src/UI/System/SystemLayout.js +++ b/src/UI/System/SystemLayout.js @@ -73,7 +73,7 @@ define( } }, - _navigate:function(route){ + _navigate: function (route){ Backbone.history.navigate(route, { trigger: true, replace: true }); }, diff --git a/src/UI/Wanted/WantedLayout.js b/src/UI/Wanted/WantedLayout.js index bca0b3435..630f2cf24 100644 --- a/src/UI/Wanted/WantedLayout.js +++ b/src/UI/Wanted/WantedLayout.js @@ -43,7 +43,7 @@ define( }, _navigate: function (route) { - Backbone.history.navigate(route); + Backbone.history.navigate(route, { trigger: false, replace: true }); }, _showMissing: function (e) {