mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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/pad.js
View file

@ -203,7 +203,8 @@ function handshake()
//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";
//connect
socket = pad.socket = io.connect(url, {
resource: resource,
@ -1035,7 +1036,7 @@ var settings = {
};
pad.settings = settings;
exports.baseURL = '';
exports.settings = settings;
exports.createCookie = createCookie;
exports.readCookie = readCookie;