summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js9
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();
};