diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventCtrl.js | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 09d75c92..76d0937a 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -113,7 +113,10 @@ angular.module('zmApp.controllers') console.log("***CALLING EVENTS FACTORY"); var lData = ZMDataModel.getLogin(); - if (lData.persistMontageOrder) + var stackState = $ionicHistory.backTitle(); + + // If you came from Monitors, disregard hidden monitors in montage + if (lData.persistMontageOrder && stackState != "Monitors") { var tempMon = message; $scope.monitors = ZMDataModel.applyMontageMonitorPrefs (tempMon, 2)[0]; @@ -825,6 +828,14 @@ angular.module('zmApp.controllers') $scope.$on('$ionicView.enter', function () { console.log("**VIEW ** Events Ctrl Entered"); ZMDataModel.setAwake(false); + + EventServer.sendMessage('push', + { + type:'badge', + badge:0, + }); + + //reset badge count $cordovaBadge.set(0).then(function() { // You have permission, badge set. @@ -1527,7 +1538,8 @@ angular.module('zmApp.controllers') if (idfound) { - $scope.events.push(myevents); + //console.log ("***********************PUSHING RELOAD EVENT " + JSON.stringify(myevents)); + $scope.events.push(myevents[i]); } } // $scope.events = myevents; |