diff options
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 5254bde3..2d5831e9 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -116,7 +116,7 @@ angular.module('zmApp.controllers') // console.log ("WS="+JSON.stringify(ws)); if (typeof ws !== 'undefined') { - NVRDataModel.debug("websocket already initialized -- thats not right.Forcing close"); + NVRDataModel.debug("websocket already initialized --Forcing close"); ws.close(true); ws=undefined; @@ -139,6 +139,10 @@ angular.module('zmApp.controllers') // Transmit auth information to server // ws.$on('$open', openHandshake); + if (ws) { + ws.onErrorCallbacks = []; + NVRDataModel.debug("Removing error handlers for websocket"); + } NVRDataModel.debug("Setting up websocket error handler"); //ws.$on('$error', function(e) ws.onError(function (e) @@ -288,7 +292,7 @@ angular.module('zmApp.controllers') { //emit alarm details - this is when received over websockets - $rootScope.$emit('alarm', + $rootScope.$broadcast('alarm', { message: listOfMonitors }); @@ -654,7 +658,7 @@ angular.module('zmApp.controllers') $rootScope.tappedEid = 0; $rootScope.tappedMid = 0; } - $rootScope.$emit('process-push'); + $rootScope.$broadcast('process-push'); } else // app is foreground |