diff options
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 9971de86..f7ade984 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -9,15 +9,15 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic var processPush = false; var broadcastHandles = []; - $scope.$on ('$ionicView.beforeEnter', function() { + $scope.$on ('$ionicView.beforeLeave', function() { //processPush = false; // NVRDataModel.debug ("BeforeEnter in Portal: setting ProcessPush to false"); }); $scope.$on ('$ionicView.beforeLeave', function() { - NVRDataModel.debug ("Deregistering broadcast handles"); + NVRDataModel.debug ("Portal: Deregistering broadcast handles"); for (var i=0; i < broadcastHandles.length; i++) { - broadcastHandles[i](); + //broadcastHandles[i](); } broadcastHandles = []; }); @@ -25,7 +25,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $scope.$on('$ionicView.enter', function() { - + NVRDataModel.setJustResumed(false); NVRDataModel.debug("Inside Portal login Enter handler"); loginData = NVRDataModel.getLogin(); @@ -285,7 +285,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic } - var pp = $rootScope.$on("process-push", function () { + var pp = $scope.$on("process-push", function () { NVRDataModel.debug("*** PROCESS PUSH HANDLER CALLED INSIDE PORTAL LOGIN, setting ProcessPush to true"); processPush = true; evaluateTappedNotification(); |