fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2470 from cetra3/timeslider_proxy_fix 

Timeslider proxy fix
This commit is contained in:
John McLear 2015-01-19 13:32:03 +00:00
parent 28aeeff154 f1c9c58c2d
commit 4ab4c9998b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/timeslider.js
View File

@ -62,8 +62,8 @@ function init() {
var resource = exports.baseURL.substring(1) + 'socket.io'; var resource = exports.baseURL.substring(1) + 'socket.io';
//build up the socket io connection //build up the socket io connection
socket = io.connect(url, {resource: resource}); socket = io.connect(url, {path: exports.baseURL + 'socket.io', resource: resource});
//send the ready message once we're connected //send the ready message once we're connected
socket.on('connect', function() socket.on('connect', function()
{ {