diff options
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index ec569943..0e3d34d0 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -47,17 +47,7 @@ angular.module('zmApp.controllers') var broadcastHandles = []; - $scope.$on ( "process-push", function () { - NVRDataModel.debug (">> MontageCtrl: 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]); - }); - + @@ -1830,6 +1820,19 @@ angular.module('zmApp.controllers') // minimal has to be beforeEnter or header won't hide $scope.$on('$ionicView.beforeEnter', function () { + + $scope.$on ( "process-push", function () { + NVRDataModel.debug (">> MontageCtrl: 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]); + }); + + timeInMontage = new Date(); broadcastHandles = []; randToAvoidCacheMem = new Date().getTime(); |
