mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 18:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Browse source
This commit is contained in:
John McLear 2015-01-19 14:33:17 +00:00
commit edbeb66d5e
25 changed files with 140 additions and 47 deletions
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';
//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
socket.on('connect', function()
{