diff --git a/lib/client/socket.js b/lib/client/socket.js index 09f5aa4e..faf2c968 100644 --- a/lib/client/socket.js +++ b/lib/client/socket.js @@ -27,7 +27,7 @@ var CloudCmd, Util, DOM, CloudFunc, io; Socket.DISCONNECTED = DISCONNECTED; function init(callback) { - DOM.jsload('/socket.io/lib/socket.io.js', { + DOM.jsload('/socket.io/socket.io.js', { onerror : Util.log.bind(Util, ERROR_MSG), onload : function() { Util.exec(callback); diff --git a/lib/server/socket.js b/lib/server/socket.js index 103190ca..708803b7 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -47,34 +47,11 @@ /** * function listen on servers port - * @pServer {Object} started server object + * @server {Object} started server object */ - function listen(pServer) { - if (io) { - io = io.listen(pServer); - - io.set('log level', INFO_LOG_LEVEL); - - /* - * on Win7 application is crashing, - * when options below is used. - * - * https://github.com/LearnBoost/socket.io/issues/1314 - * - */ - if (!WIN32) { - io.enable('browser client minification'); - io.enable('browser client gzip'); - io.enable('browser client etag'); - } - - io.set('transports', [ - 'websocket', - 'htmlfile', - 'xhr-polling', - 'jsonp-polling' - ]); - } + function listen(server) { + if (io) + io = io.listen(server); return io; } diff --git a/package.json b/package.json index ece50a58..09354aa8 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "dropbox": "0.10.2", "minify": "~0.6.x", - "socket.io": "0.9.16", + "socket.io": "~1.0.0", "express": "~4.1.1", "morgan": "~1.0.0", "http-auth": "2.1.x",