From 5f89e19b635f9cb49eed6e71664f4c0af38dc6c2 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Sun, 13 Mar 2016 14:41:02 -0400 Subject: #193 fixes Former-commit-id: c496b0d17d03262f323532164703445cc78d9dfd --- www/js/PortalLoginCtrl.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'www/js') diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index d0c94f32..da927395 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -10,6 +10,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic function () { ZMDataModel.zmDebug("Inside Portal login Enter handler"); + + loginData = ZMDataModel.getLogin(); $ionicHistory.nextViewOptions({ @@ -133,7 +135,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic disableAnimate: true, disableBack: true }); - $state.go('login'); + // $state.go('login'); } else { @@ -273,7 +275,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic disableAnimate: true, disableBack: true }); - $state.go('login'); + //$state.go('login'); } else { @@ -300,7 +302,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic //------------------------------------------------------------------------------- // console.log("************* ENTERING PORTAL MAIN "); ZMDataModel.zmLog ("Entering Portal Main"); - var loginData = ZMDataModel.getLogin(); + var loginData; $ionicSideMenuDelegate.canDragContent(false); -- cgit v1.2.3