diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-22 11:50:53 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-22 11:50:53 -0400 |
| commit | ff613f8e6210d2c4cd2f8deacc0096e18aff2fcd (patch) | |
| tree | dee024287af53b9c9189b6acd1b783fa0ef1a527 /www/js/LogCtrl.js | |
| parent | e3ee3eeeb220cfce88ddfdb2189ec6e49432565f (diff) | |
#725 move push handlers inside beforeEnter for better consistency
Diffstat (limited to 'www/js/LogCtrl.js')
| -rw-r--r-- | www/js/LogCtrl.js | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 9a84661a..2858e289 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -26,16 +26,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo loadLogs(); } - $scope.$on ( "process-push", function () { - NVRDataModel.debug (">> LogCtrl: 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.flipLogs = function () { if ($scope.logEntity == 'ZoneMinder') @@ -267,6 +258,22 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo // 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('$ionic.beforeEnter', function () { + + $scope.$on ( "process-push", function () { + NVRDataModel.debug (">> LogCtrl: 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 ** Log Ctrl Entered"); |
