diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-18 20:31:02 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-18 20:31:02 -0400 |
| commit | 3b0d4074ac4f0234e074f3efca9709f7158a8df4 (patch) | |
| tree | affd45972e4aee2b95fb71f5aca4707765b8ca1d /www/js/PortalLoginCtrl.js | |
| parent | aa4a001e4d016fc5bf3955ddde61d125aa456d70 (diff) | |
nits
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 81f36b14..345d6994 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -49,7 +49,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic ZMDataModel.zmLog("TouchID not supported"); }); } else { - ZMDataModel.zmLog("Not iOS, not checking for touchID"); + ZMDataModel.zmLog("not checking for touchID"); } if (loginData.usePin) { @@ -89,6 +89,16 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic } }); EventServer.refresh(); + + if ($rootScope.tappedNotification) + { + console.log ("***** NOTIFICATION TAPPED GOING TO EVENTS "); + $rootScope.tappedNotification = 0; + $ionicHistory.nextViewOptions({disableBack: true}); + $state.go("events", {"id": 0}, { reload: true }); + return; + } + $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam); }, // coming here means auth error @@ -180,6 +190,17 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic }); ZMDataModel.getKeyConfigParams(1); + + if ($rootScope.tappedNotification) + { + $rootScope.tappedNotification = 0; + $ionicHistory.nextViewOptions({disableBack: true}); + console.log ("***** NOTIFICATION TAPPED GOING TO EVENTS "); + $state.go("events", {"id": 0}, { reload: true }); + return; + + } + if ($rootScope.lastState == 'lowversion') $rootScope.lastState = 'montage'; ZMDataModel.zmDebug("Transitioning state to: " + $rootScope.lastState ? $rootScope.lastState : 'montage'); console.log ("*********** GOING TO " + $rootScope.lastState); |