diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-21 18:49:32 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-21 18:49:32 -0400 |
| commit | e3076881b748fff53690373f02211706b60fab79 (patch) | |
| tree | b417ca52d1be5198bd5f7aefe646782b0d60b4db /www/js/TimelineCtrl.js | |
| parent | 3f549f3d6ea3dac1fbf862e236549ce0dd7fd570 (diff) | |
#725 moved evaluate tapped notification to service,trapped handler in all controllers
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 4a144092..a75199f4 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -20,6 +20,18 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $ionicSideMenuDelegate.toggleLeft(); }; + + $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 //---------------------------------------------------------------- @@ -285,7 +297,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla NVRDataModel.debug("Timeline: Deregistering broadcast handles"); for (var i = 0; i < broadcastHandles.length; i++) { - // broadcastHandles[i](); + broadcastHandles[i](); } broadcastHandles = []; |
