diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/LoginCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/app.js | 20 |
3 files changed, 21 insertions, 5 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 27e784d1..f37f2b56 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -95,7 +95,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // default in packages instead of /cgi-bin //if ($scope.loginData.streamingurl.slice(-3).toLowerCase() == '/zm') { //$scope.loginData.streamingurl = $scope.loginData.streamingurl.slice(0, -3); - } + //} // if ($scope.loginData.apiurl.indexOf($scope.loginData.url) !=0) diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 6b5e9259..12947b8c 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -31,7 +31,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic { ZMDataModel.zmDebug("PortalLogin: auth success"); ZMDataModel.getKeyConfigParams(1); - $state.go('montage'); + $state.go($rootScope.lastState? $rootScope.lastState:'montage', $rootScope.lastStateParam); }, // coming here means auth error // so go back to login @@ -93,7 +93,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic { ZMDataModel.zmDebug("PortalLogin: auth success"); ZMDataModel.getKeyConfigParams(1); - $state.go('montage'); + $state.go($rootScope.lastState? $rootScope.lastState:'montage',$rootScope.lastStateParam); }, // coming here means auth error // so go back to login diff --git a/www/js/app.js b/www/js/app.js index 771f9fb1..2ed58cd6 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -620,8 +620,24 @@ angular.module('zmApp', [ disableAnimate: true, disableBack: true }); - $state.go("zm-portal-login"); - + + // remember the last state so we can + // go back there after auth + if ($ionicHistory.currentView) + { + $rootScope.lastState = $ionicHistory.currentView().stateName; + $rootScope.lastStateParam = + $ionicHistory.currentView().stateParams; + ZMDataModel.zmDebug ("Last State recorded:" + + JSON.stringify($ionicHistory.currentView())); + + $state.go("zm-portal-login"); + } + else + { + $rootScope.lastState = ""; + $rootScope.lastStateParam = ""; + } //$ionicSideMenuDelegate.toggleLeft(false); //ZMDataModel.validatePin() |