diff options
| -rw-r--r-- | www/js/EventServer.js | 4 | ||||
| -rw-r--r-- | www/js/EventServerSettingsCtrl.js | 6 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 14 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 2 |
4 files changed, 21 insertions, 5 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index d8d04ad6..de72197b 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -243,6 +243,10 @@ angular.module('zmApp.controllers') function disconnect() { ZMDataModel.zmLog("Disconnecting and deleting Event Server socket..."); + + if (typeof ws === 'undefined') + return; + ws.$close(); ws.$un('open'); ws.$un('close'); diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index d061964b..67654dff 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -153,15 +153,15 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', $scope.loginData.disablePush = ($scope.check.disablePush) ? "1" : "0"; ZMDataModel.setLogin($scope.loginData); - console.log("**** EVENT MONSTRING " + monstring); - console.log("**** EVENT INTERVALSTRING " + intervalstring); + //console.log("**** EVENT MONSTRING " + monstring); + //console.log("**** EVENT INTERVALSTRING " + intervalstring); var pushstate = "enabled"; if ($scope.loginData.disablePush == "1") pushstate = "disabled"; - if ($scope.loginData.isUseEventServer) { + if ($scope.loginData.isUseEventServer=="1") { EventServer.init() .then(function (data) { console.log("Sending control filter"); diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 7b1399b6..97b79658 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -60,8 +60,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r var zmServers = ZMDataModel.getServerGroups(); $scope.loginData = zmServers[serverbuttons[index].text]; $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; - $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + if (!$scope.check.isUseEventServer) + $rootScope.isAlarm = 0; + if ($scope.check.isUseEventServer) + EventServer.init(); return true; }, @@ -81,6 +85,14 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData = zmServers[Object.keys(zmServers)[0]]; ZMDataModel.setLogin($scope.loginData); + availableServers = Object.keys(ZMDataModel.getServerGroups()); + serverbuttons = []; + for (var servIter=0; servIter<availableServers.length; servIter++) + { + serverbuttons.push({text: availableServers[servIter]}); + console.log ("ADDING : "+availableServers[servIter]); + } + } else { diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 5884ddf3..7f264f4d 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -214,7 +214,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' { console.log ("**** TRAPPED EVENT: "+alarmMonitors[i]); - for (var j=0; i<$scope.monitors.length; j++) + for (var j=0; j<$scope.monitors.length; j++) { if ($scope.monitors[j].Monitor.Id == alarmMonitors[i]) { |