From af57413cfac4d1b004b7f2b0a34e506bee143a0c Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Thu, 23 Jun 2011 14:09:41 +0100 Subject: [PATCH] Ops, forgot the static files --- static/js/collab_client.js | 2 +- static/js/pad2.js | 4 ++-- static/timeslider.html | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/js/collab_client.js b/static/js/collab_client.js index af327594..2e336a74 100644 --- a/static/js/collab_client.js +++ b/static/js/collab_client.js @@ -270,7 +270,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options) { } function sendMessage(msg) { - socket.send({type: "COLLABROOM", component: "pad", data: msg}); + socket.json.send({type: "COLLABROOM", component: "pad", data: msg}); } function wrapRecordingErrors(catcher, func) { diff --git a/static/js/pad2.js b/static/js/pad2.js index 1efb7eb2..e359b044 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -60,7 +60,7 @@ function randomString() { function handshake() { - socket = new io.connect(); + socket = io.connect(); socket.on('connect', function(){ var padId= document.URL.substring(document.URL.lastIndexOf("/")+1); @@ -80,7 +80,7 @@ function handshake() "token": token, "protocolVersion": 2}; - socket.send(msg); + socket.json.send(msg); }); var receivedClientVars=false; diff --git a/static/timeslider.html b/static/timeslider.html index a051530a..c8e97cc5 100644 --- a/static/timeslider.html +++ b/static/timeslider.html @@ -70,8 +70,7 @@ } //build up the socket io connection - socket = new io.Socket(); - socket.connect(); + socket = io.connect(); //send the ready message once we're connected socket.on('connect', function() @@ -105,7 +104,7 @@ "token": token, "protocolVersion": 2}; - socket.send(msg); + socket.json.send(msg); } var fireWhenAllScriptsAreLoaded = [];