diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-07-24 15:02:18 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-07-24 15:02:18 -0400 |
| commit | 206d3f7dcefd486d1927251a3c062d6b0e198e2e (patch) | |
| tree | 6f33dd73f0fa12e3a9c9a067efd53b38668991a5 /www | |
| parent | 3b829d0411ac491720ea563017875eaf6a8de327 (diff) | |
#674 destroy modal if new event tapped
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventCtrl.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 81bf4cb2..c2d0125e 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1084,6 +1084,10 @@ angular.module('zmApp.controllers') //---------------------------------------------------------------- $scope.handleAlarms = function () { // $rootScope.isAlarm = !$rootScope.isAlarm; + + if ($scope.modal !== undefined) { + $scope.modal.remove(); + } if ($rootScope.isAlarm) { $rootScope.alarmCount = "0"; $rootScope.isAlarm = !$rootScope.isAlarm; @@ -1099,6 +1103,7 @@ angular.module('zmApp.controllers') { reload: true }); */ + getInitialEvents(); return; } |