From f4342f68a29b1eb8a24f001b8db7af60c5637f3b Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Apr 2017 21:26:51 -0700 Subject: [PATCH] Fixed not defined error in eslint in socket.io.client.service.js --- .../base/services/socket.io.client.service.js | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/public/form_modules/forms/base/services/socket.io.client.service.js b/public/form_modules/forms/base/services/socket.io.client.service.js index 334e87f4..ae0791d7 100644 --- a/public/form_modules/forms/base/services/socket.io.client.service.js +++ b/public/form_modules/forms/base/services/socket.io.client.service.js @@ -9,29 +9,7 @@ Socket.$inject = ['$timeout', '$window']; function Socket($timeout, $window) { - var service = { - connect: connect, - emit: emit, - on: on, - removeListener: removeListener, - socket: null - }; - - var url = ''; - console.log("$window.socketPort: "+$window.socketPort); - console.log("$window.socketUrl: "+$window.socketUrl); - if($window.socketUrl && $window.socketPort){ - url = window.location.protocol + '//' + $window.socketUrl + ':' + $window.socketPort; - } else if ($window.socketUrl && !$window.socketPort){ - url = window.location.protocol + '//' + $window.socketUrl; - } else if ($window.socketPort){ - url = window.location.protocol + '//' + window.location.hostname + ':' + $window.socketPort; - } else { - url = window.location.protocol + '//' + window.location.hostname; - } - connect(url); - - return service; + // Connect to Socket.io server function connect(url) { @@ -62,5 +40,29 @@ service.socket.removeListener(eventName); } } + + var service = { + connect: connect, + emit: emit, + on: on, + removeListener: removeListener, + socket: null + }; + + var url = ''; + console.log("$window.socketPort: "+$window.socketPort); + console.log("$window.socketUrl: "+$window.socketUrl); + if($window.socketUrl && $window.socketPort){ + url = window.location.protocol + '//' + $window.socketUrl + ':' + $window.socketPort; + } else if ($window.socketUrl && !$window.socketPort){ + url = window.location.protocol + '//' + $window.socketUrl; + } else if ($window.socketPort){ + url = window.location.protocol + '//' + window.location.hostname + ':' + $window.socketPort; + } else { + url = window.location.protocol + '//' + window.location.hostname; + } + connect(url); + + return service; } }());