diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 11:08:00 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 11:08:00 -0500 |
| commit | 85d0cf4508b00e52f7c3c0b437541eb4702c660a (patch) | |
| tree | 1dabd0cc6d84e978b1d1f296f6e98ef063ffda23 /www/js/EventCtrl.js | |
| parent | 8cc0496efc897a7fc9b03be30839b4dc6f25c071 (diff) | |
#103 - moving alarm count to the API
Former-commit-id: 15614ad820631a3d202bbecd5ae83e6a7c15540e
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index beadd18b..8c1f4a02 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -24,7 +24,7 @@ angular.module('zmApp.controllers') $scope.weeks = []; $scope.months = []; - $scope.minAlarmCount = "1"; + $scope.eventList = { showDelete: false @@ -946,11 +946,11 @@ angular.module('zmApp.controllers') if ($scope.showSearch == false) $scope.search.text = ""; - console.log("**** Setting search view to " + $scope.showSearch + " ****"); + //console.log("**** Setting search view to " + $scope.showSearch + " ****"); if (enableLoadMore == false && $scope.showSearch == false) { moreEvents = true; enableLoadMore = true; - console.log("REMOVING ARTIFICAL LOAD MORE BLOCK"); + //console.log("REMOVING ARTIFICAL LOAD MORE BLOCK"); } }; @@ -1402,7 +1402,8 @@ angular.module('zmApp.controllers') $scope.toggleMinAlarmFrameCount = function () { console.log ("Toggling"); - $scope.minAlarmCount = ($scope.minAlarmCount == '0') ? '1':'0'; + $rootScope.minAlarmCount = ($rootScope.minAlarmCount == '0') ? '1':'0'; + doRefresh(); }; |