libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Begin to repair damage done to rooms logic

Browse source
This commit is contained in:
John McLear 2014-11-04 19:55:05 +00:00
parent 95e7b0f156
commit 68eaa09708
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/node/handler/PadMessageHandler.js
View file

@ -754,9 +754,14 @@ function handleUserChanges(data, cb)
exports.updatePadClients = function(pad, callback) exports.updatePadClients = function(pad, callback)
{ {
/*
//skip this step if noone is on this pad //skip this step if noone is on this pad
var roomClients = socketio.sockets.clients(pad.id); var roomClients = [], room = socketio.sockets.adapter.rooms[pad.id];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
if(roomClients.length==0) if(roomClients.length==0)
return callback(); return callback();
@ -769,10 +774,8 @@ exports.updatePadClients = function(pad, callback)
var revCache = {}; var revCache = {};
//go trough all sessions on this pad //go trough all sessions on this pad
async.forEach(roomClients, function(client, callback) async.forEach(roomClients, function(client, callback){
{
var sid = client.id; var sid = client.id;
//https://github.com/caolan/async#whilst //https://github.com/caolan/async#whilst
//send them all new changesets //send them all new changesets
async.whilst( async.whilst(
@ -802,7 +805,8 @@ exports.updatePadClients = function(pad, callback)
if(author == sessioninfos[sid].author) if(author == sessioninfos[sid].author)
{ {
client.json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}}); // client.json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
socketio.in(pad).send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
} }
else else
{ {
@ -817,7 +821,9 @@ exports.updatePadClients = function(pad, callback)
timeDelta: currentTime - sessioninfos[sid].time timeDelta: currentTime - sessioninfos[sid].time
}}; }};
client.json.send(wireMsg); // client.json.send(wireMsg);
socketio.in(pad).send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
} }
sessioninfos[sid].time = currentTime; sessioninfos[sid].time = currentTime;
@ -830,7 +836,6 @@ exports.updatePadClients = function(pad, callback)
callback callback
); );
},callback); },callback);
*/
} }
/** /**