diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-15 09:49:34 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-15 09:49:34 -0400 |
| commit | deeec5ff33576e3b57bce7dd24db6aa0d67eb90b (patch) | |
| tree | bc4cd0d50cf601e6fb3cdfe9de177c31cd33624e /www/js/EventServer.js | |
| parent | bd1607efcaea59a5b4269628d5aa2999d6911b3e (diff) | |
beautify
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 32f6cbac..1340b88d 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -319,24 +319,23 @@ angular.module('zmApp.controllers') NVRDataModel.log("Clearing error/close cbk, disconnecting and deleting Event Server socket..."); - if ($rootScope.platforOS == 'desktop'){ + if ($rootScope.platforOS == 'desktop') { if (typeof ws === 'undefined') { NVRDataModel.log("Event server socket is empty, nothing to disconnect"); return; } - - + + ws.onmessage = null; ws.close(); ws = undefined; - } - else { + } else { if (nativeWebSocketId != -1) //native; - CordovaWebsocketPlugin.wsClose(nativeWebSocketId, 1000, "Connection closed"); - nativeWebSocketId = -1; + CordovaWebsocketPlugin.wsClose(nativeWebSocketId, 1000, "Connection closed"); + nativeWebSocketId = -1; } - + } @@ -371,13 +370,12 @@ angular.module('zmApp.controllers') NVRDataModel.debug("~~~~ sendMessage: Sending->" + jmsg); if ($rootScope.platformOS == 'desktop') { - ws.send(jmsg); - } - else { + ws.send(jmsg); + } else { if (nativeWebSocketId != -1) - CordovaWebsocketPlugin.wsSend(nativeWebSocketId, jmsg); - else - NVRDataModel.debug ("ERROR:native websocket not initialized, can't send "+jmsg); + CordovaWebsocketPlugin.wsSend(nativeWebSocketId, jmsg); + else + NVRDataModel.debug("ERROR:native websocket not initialized, can't send " + jmsg); } |
