diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-08 14:53:07 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-08 14:53:07 -0400 |
| commit | 59e87770d8c7ffe45b55c31fd4b2acd49de00ecc (patch) | |
| tree | d12bf444c6864882363534cc73864bc61ec4a41d /www/js | |
| parent | ac992d9d8be5dd71e60c5650efe84c3f40a36e6e (diff) | |
alarm notifications in modal views added
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageCtrl.js | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index dce5cd13..cc6edc1e 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -246,6 +246,23 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $state.go("events", {"id": 0}, { reload: true }); } }; + + $scope.handleAlarmsWhileMinimized = function() + { + $rootScope.isAlarm=!$rootScope.isAlarm; + + $scope.minimal = !$scope.minimal; + ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal); + ionic.Platform.fullScreen($scope.minimal, !$scope.minimal); + $interval.cancel(intervalHandle); + + if (!$rootScope.isAlarm) + { + $rootScope.alarmCount="0"; + $ionicHistory.nextViewOptions({disableBack: true}); + $state.go("events", {"id": 0}, { reload: true }); + } + }; //------------------------------------------------------------- // Called when user taps on the reorder button |
