From 72c744252722d38c2c74d165a88873652f3bcf5f Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Sun, 26 Apr 2015 23:33:41 +0300 Subject: [PATCH 1/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f5e6fb9..fd5a12b6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "node-uuid": "~1.4.1", "nodemon": "~1.0.13", "npid": "~0.4.0", - "socket.io": "~0.9.16", + "socket.io": "~1.3", "shrinkwrap": "~0.0.3", "underscore": "~1.5.2", "bower": "~1.2.8" From 1005dccd7363afa28b17a02edd87f1cf4e7e7e40 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Sun, 26 Apr 2015 23:54:47 +0300 Subject: [PATCH 2/6] Update client.js --- public/js/client.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/js/client.js b/public/js/client.js index b14d88f1..74545285 100644 --- a/public/js/client.js +++ b/public/js/client.js @@ -79,10 +79,11 @@ function timeFormat(msTime) { zeroPad(d.getSeconds(), 2) + " "; } +//setup "global" variables first +var socket = io.connect("127.0.0.1:3000"); +var myRoomID = null; + $(document).ready(function() { - //setup "global" variables first - var socket = io.connect("127.0.0.1:3000"); - var myRoomID = null; $("form").submit(function(event) { event.preventDefault(); From 32f2f0b2798433eacd9a1cda23f074550b9de936 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 27 Apr 2015 00:07:08 +0300 Subject: [PATCH 3/6] Update client.js --- public/js/client.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/js/client.js b/public/js/client.js index 74545285..ae1f6605 100644 --- a/public/js/client.js +++ b/public/js/client.js @@ -79,10 +79,6 @@ function timeFormat(msTime) { zeroPad(d.getSeconds(), 2) + " "; } -//setup "global" variables first -var socket = io.connect("127.0.0.1:3000"); -var myRoomID = null; - $(document).ready(function() { $("form").submit(function(event) { From e1c5d2ad75ce5396e1f12976fdeb00846c56fd07 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 27 Apr 2015 00:07:52 +0300 Subject: [PATCH 4/6] Update index.html --- public/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/index.html b/public/index.html index 947ae340..8ba54de6 100644 --- a/public/index.html +++ b/public/index.html @@ -79,6 +79,11 @@ + From aac98eda7284d33e20682a306a38445f7d7196e2 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 27 Apr 2015 20:18:04 +0300 Subject: [PATCH 5/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd5a12b6..a20d3ee0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "server.js", "dependencies": { "ejs": "~0.8.5", - "express": "~3.4.8", + "express": "~3.3.x", "node-uuid": "~1.4.1", "nodemon": "~1.0.13", "npid": "~0.4.0", From 45e3ff87d3fcc3521bdf29045ab97c5cd82eac80 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 27 Apr 2015 21:21:30 +0300 Subject: [PATCH 6/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a20d3ee0..9babe13d 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "node-uuid": "~1.4.1", "nodemon": "~1.0.13", "npid": "~0.4.0", - "socket.io": "~1.3", + "socket.io": "1.3.5", "shrinkwrap": "~0.0.3", "underscore": "~1.5.2", "bower": "~1.2.8"