From fcad5d2d8d654cd5dba9181a34f536da4aeb49ad Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Wed, 16 Mar 2016 09:57:05 -0400 Subject: cleaning up portal login code Former-commit-id: 34bde612d06495a041eb80ad934c90c6f858beaa --- www/js/app.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'www/js/app.js') diff --git a/www/js/app.js b/www/js/app.js index d57b6ecf..e5100e05 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1213,6 +1213,12 @@ angular.module('zmApp', [ $ionicHistory.currentView().stateParams; ZMDataModel.zmDebug("Last State recorded:" + JSON.stringify($ionicHistory.currentView())); + + if ($rootScope.lastState == "zm-portal-login") { + ZMDataModel.zmDebug("Last state was portal-login, so forcing montage"); + $rootScope.lastState = "montage"; + } + ZMDataModel.zmDebug ("going to portal login"); $state.go("zm-portal-login"); } else { @@ -1220,6 +1226,9 @@ angular.module('zmApp', [ $rootScope.lastStateParam = ""; ZMDataModel.zmDebug ("reset lastState to null"); } + + + //$ionicSideMenuDelegate.toggleLeft(false); //ZMDataModel.validatePin() -- cgit v1.2.3