summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-01-08 10:10:24 -0500
committerPliable Pixels <pliablepixels@gmail.com>2018-01-08 10:10:24 -0500
commite4ab4d9769331713288040f96044e188d15d6d49 (patch)
treed925f3aa569d5bd5f4028918ea4bf0915f922bce
parent9c41352c661460f10d35c31292b5d80420b8fa9c (diff)
tiny tweaks to stabilize the eventserver mess
-rw-r--r--www/js/EventServerSettingsCtrl.js4
-rwxr-xr-xwww/js/app.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 8bf08e2e..25811801 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -223,6 +223,10 @@
$scope.loginData.eventServerMonitors = monstring;
$scope.loginData.eventServerInterval = intervalstring;
+ $rootScope.monstring = monstring;
+ $rootScope.intstring = intervalstring;
+
+
// console.log ("SAVED: " + JSON.stringify($scope.loginData));
NVRDataModel.setLogin($scope.loginData);
diff --git a/www/js/app.js b/www/js/app.js
index 1a5d86bd..1a226155 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -43,7 +43,7 @@ angular.module('zmApp', [
.constant('zm', {
minAppVersion: '1.28.107', // if ZM is less than this, the app won't work
recommendedAppVersion: '1.29',
- minEventServerVersion: '0.95',
+ minEventServerVersion: '0.98.1',
castAppId: 'BA30FB4C',
alarmFlashTimer: 20000, // time to flash alarm
gcmSenderId: '710936220256',