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

Remove dependency on a global socket and address pad.socket instead.

Browse source
This commit is contained in:
Chad Weider 2012-01-17 00:43:11 -08:00
parent 6bbc32a19f
commit 003c2a59aa
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/pad2.js
View file

@ -185,7 +185,7 @@ function handshake()
//find out in which subfolder we are
var resource = loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "socket.io";
//connect
socket = io.connect(url, {
socket = pad.socket = io.connect(url, {
resource: resource,
'max reconnection attempts': 3
});
@ -474,7 +474,7 @@ var pad = {
pad.collabClient = getCollabClient(padeditor.ace, clientVars.collab_client_vars, pad.myUserInfo, {
colorPalette: pad.getColorPalette()
});
}, pad);
pad.collabClient.setOnUserJoin(pad.handleUserJoin);
pad.collabClient.setOnUpdateUserInfo(pad.handleUserUpdate);
pad.collabClient.setOnUserLeave(pad.handleUserLeave);