#725 move push handlers inside beforeEnter for better consistency

1 files changed, 14 insertions, 11 deletions

diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index 5592baa3..1e194fab 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -10,17 +10,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
 
   };
 
-  $scope.$on ( "process-push", function () {
-    NVRDataModel.debug (">> DevOptionsCtrl: 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]);
-  });
-
+  
   //----------------------------------------------------------------
   // Alarm notification handling
   //----------------------------------------------------------------
@@ -58,6 +48,19 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
   // state, that effectively overwrites current view power management needs
   //------------------------------------------------------------------------
   $scope.$on('$ionicView.beforeEnter', function () {
+
+    $scope.$on ( "process-push", function () {
+      NVRDataModel.debug (">> DevOptionsCtrl: 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]);
+    });
+  
+
     //console.log("**VIEW ** DevOptions Ctrl Entered");
     $scope.loginData = NVRDataModel.getLogin();
     console.log("DEV LOGS=" + $scope.loginData.enableLogs);