Socket.io update

node.server/flux.orion.integration/FluxEditor.js

@@ -18,7 +18,7 @@ define(function (require) {
 
 require('lib/sha1'); //Not AMD defines 'CryptoJS global variable.
 
-var io = require('lib/socket.io');
+var io = require('socketio');
 var Deferred = require('orion/Deferred');
 var authorize = require('authorize');
 
@@ -72,10 +72,10 @@ var FluxEditor = (function() {
 	FluxEditor.prototype = /**@lends eclipse.FluxEditor.prototype */
 	{
 		_createSocket: function (user) {
-			this.socket = io.connect(
-				this._host, {
-				port: this._port
+			this.socket = io({
+				transports : ['websocket']
 			});
+			this.socket.connect('http://' + this._host + ':' + this._port);
 
 			this._resourceUrl = null;
 

node.server/flux.orion.integration/FluxFileSystem.js

@@ -10,9 +10,8 @@
  ******************************************************************************/
 /*global define console CryptoJS */
 define(function(require) {
-
 var Deferred = require('orion/Deferred');
-var io = require('lib/socket.io');
+var io = require('socketio');
 require('lib/sha1'); //Not AMD. Defines 'CryptoJS global.
 
 var authorize = require('authorize');
@@ -103,11 +102,13 @@ var FluxFileSystem = (function() {
 				console.log('STOP! no second socket!');
 				return;
 			}
+
 			console.log('Create socket for ', user);
 			this._connectedToChannel = new Deferred();
-			this.socket = io.connect(this._host, {
-				port: this._port
-			});
+			this.socket = io({
+			    transports : ['websocket']
+            });
+			this.socket.connect('http://' + this._host + ':' + this._port);
 
 			var self = this;
 

node.server/flux.orion.integration/OpenDeclaration.js

@@ -13,7 +13,7 @@
 
 define(function (require) {
 
-var io = require('lib/socket.io');
+var io = require('socketio');
 var Deferred = require('orion/Deferred');
 var authorize = require('authorize');
 
@@ -41,9 +41,10 @@ var OpenDeclaration = (function() {
 	OpenDeclaration.prototype = /**@lends flux.NavigateAction.prototype */
 	{
 		_createSocket: function (user) {
-			this.socket = io.connect(this._host, {
-				port: this._port
+			this.socket = io({
+				transports : ['websocket']
 			});
+			this.socket.connect('http://' + this._host + ':' + this._port);
 
 			this._resourceUrl = null;
 

node.server/flux.orion.integration/flux.js

@@ -11,6 +11,9 @@
 
 /*global require window location console*/
 require.config({
+	paths: {
+		socketio: '/socket.io/socket.io'
+	},
     packages: [
         {name: "when", location: "bower_components/when", main: "when"},
         {name: "rest", location: "bower_components/rest", main: "rest"}