#725 move push handlers inside beforeEnter for better consistency

1 files changed, 17 insertions, 10 deletions

diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 096df1e0..cef454a7 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -35,16 +35,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
   getRunStatus();
 
 
-  $scope.$on ( "process-push", function () {
-    NVRDataModel.debug (">> StateCtrl: push handler");
-    var s = NVRDataModel.evaluateTappedNotification();
-    NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
-    $ionicHistory.nextViewOptions({
-      disableAnimate:true,
-      disableBack: true
-    });
-    $state.go(s[0],s[1],s[2]);
-  });
+
 
   // Let's stagger this by 500ms each to see if Chrome lets these through
   // This may also help if your Apache is not configured to let multiple connections through
@@ -72,6 +63,22 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
   // reset power state on exit as if it is called after we enter another
   // state, that effectively overwrites current view power management needs
   //------------------------------------------------------------------------
+  
+  
+  $scope.$on ('$ionicView.beforeEnter', function () {
+
+    $scope.$on ( "process-push", function () {
+      NVRDataModel.debug (">> StateCtrl: push handler");
+      var s = NVRDataModel.evaluateTappedNotification();
+      NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
+      $ionicHistory.nextViewOptions({
+        disableAnimate:true,
+        disableBack: true
+      });
+      $state.go(s[0],s[1],s[2]);
+    });
+  });
+  
   $scope.$on('$ionicView.enter', function () {
     // console.log("**VIEW ** Montage Ctrl Entered");
     NVRDataModel.setAwake(false);