summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-03-13 14:41:02 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-03-13 14:41:02 -0400
commit5f89e19b635f9cb49eed6e71664f4c0af38dc6c2 (patch)
treee5988e88b8654aad4a6b3128347d7727a8020c9a /www/js
parent8e1a83fe25b20c40aedbe099e73bc9942e878eed (diff)
#193 fixes
Former-commit-id: c496b0d17d03262f323532164703445cc78d9dfd
Diffstat (limited to 'www/js')
-rw-r--r--www/js/PortalLoginCtrl.js8
1 files changed, 5 insertions, 3 deletions
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);