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

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
Wikinaut 2011-11-14 08:32:46 +01:00
commit 916e900cf3
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
node/handler/PadMessageHandler.js
View file

@ -136,7 +136,7 @@ exports.handleDisconnect = function(client)
{
if(pad2sessions[sessionPad][i] == client.id)
{
delete pad2sessions[sessionPad][i];
pad2sessions[sessionPad].splice(i, 1);
break;
}
}
@ -809,15 +809,10 @@ function handleClientReady(client, message)
//Send the clientVars to the Client
client.json.send(clientVars);
//sometimes the client disconnects very early and the session of it is already removed
//thats why we have to check that case
if(sessioninfos[client.id] !== undefined)
{
//Save the revision and the author id in sessioninfos
sessioninfos[client.id].rev = pad.getHeadRevisionNumber();
sessioninfos[client.id].author = author;
}
//Save the revision and the author id in sessioninfos
sessioninfos[client.id].rev = pad.getHeadRevisionNumber();
sessioninfos[client.id].author = author;
//prepare the notification for the other users on the pad, that this user joined
var messageToTheOtherUsers = {
"type": "COLLABROOM",