mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source
This commit is contained in:
Egil Moeller 2012-04-25 17:51:03 +02:00
commit c173ebe197
11 changed files with 408 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/static/js/timeslider.js
View file

@ -60,8 +60,8 @@ function init() {
//create the url
var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
//find out in which subfolder we are
var resource = loc.pathname.substr(1,loc.pathname.indexOf("/p/")) + "socket.io";
var resource = exports.baseURL + 'socket.io';
//build up the socket io connection
socket = io.connect(url, {resource: resource});
@ -162,4 +162,5 @@ function handleClientVars(message)
}
}
exports.baseURL = '';
exports.init = init;