#725 move push handlers inside beforeEnter for better consistency

1 files changed, 13 insertions, 11 deletions

diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index f6125fb6..bfcb34da 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -21,17 +21,6 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
   };
 
 
-  $scope.$on ( "process-push", function () {
-    NVRDataModel.debug (">> TimelineCtrl: 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]);
-  });
-
   //---------------------------------------f-------------------------
   // Alarm notification handling
   //----------------------------------------------------------------
@@ -318,6 +307,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
   $scope.$on('$ionicView.beforeEnter', function () {
 
+
+
+  $scope.$on ( "process-push", function () {
+    NVRDataModel.debug (">> TimelineCtrl: 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]);
+  });
+  
     //$ionicHistory.clearCache();
     //$ionicHistory.clearHistory();
     timeline = '';