diff --git a/public/modules/forms/base/services/socket.io.client.service.js b/public/modules/forms/base/services/socket.io.client.service.js index cef67f4b..5c8a39e3 100644 --- a/public/modules/forms/base/services/socket.io.client.service.js +++ b/public/modules/forms/base/services/socket.io.client.service.js @@ -9,28 +9,6 @@ Socket.$inject = ['$timeout', '$window']; function Socket($timeout, $window) { - var service = { - connect: connect, - emit: emit, - on: on, - removeListener: removeListener, - socket: null - }; - - var url = ''; - if($window.socketPort && $window.socketUrl){ - url = $window.socketUrl + ':' + $window.socketPort; - } else if ($window.socketUrl && !$window.socketUrl){ - url = $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) { service.socket = io(url, {'transports': ['websocket', 'polling']}); @@ -60,5 +38,27 @@ service.socket.removeListener(eventName); } } + + var service = { + connect: connect, + emit: emit, + on: on, + removeListener: removeListener, + socket: null + }; + + var url = ''; + if($window.socketPort && $window.socketUrl){ + url = $window.socketUrl + ':' + $window.socketPort; + } else if ($window.socketUrl && !$window.socketUrl){ + url = $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; } }());