mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-22 08:26:16 -04:00
Send commits missed during the reconnect
This commit is contained in:
parent
bf05e9ae89
commit
d41e184a3c
2 changed files with 36 additions and 9 deletions
|
@ -1177,33 +1177,51 @@ function handleClientReady(client, message)
|
|||
{
|
||||
changesetsNeeded.push(r);
|
||||
}
|
||||
//get all changesets
|
||||
async.forEach(changesetsNeeded, function(revNum)
|
||||
callback();
|
||||
},
|
||||
//get all changesets
|
||||
function(callback)
|
||||
{
|
||||
async.eachSeries(changesetsNeeded, function(revNum, callback)
|
||||
{
|
||||
pad.getRevisionChangeset(revNum, function(err, value)
|
||||
{
|
||||
if(ERR(err)) return;
|
||||
changesets[revNum] = value;
|
||||
callback();
|
||||
});
|
||||
}, callback);
|
||||
},
|
||||
function(callback)
|
||||
{
|
||||
async.eachSeries(changesetsNeeded, function(revNum, callback)
|
||||
{
|
||||
pad.getRevisionAuthor(revNum, function(err, value)
|
||||
{
|
||||
if(ERR(err)) return;
|
||||
changesetsAuthor[revNum] = value;
|
||||
callback();
|
||||
});
|
||||
}, callback);
|
||||
},
|
||||
function(callback)
|
||||
{
|
||||
async.eachSeries(changesetsNeeded, function(revNum, callback)
|
||||
{
|
||||
pad.getRevisionDate(revNum, function(err, value)
|
||||
{
|
||||
if(ERR(err)) return;
|
||||
changesetsTimestamp[revNum] = value;
|
||||
callback();
|
||||
});
|
||||
});
|
||||
callback(null);
|
||||
}, callback);
|
||||
}
|
||||
],
|
||||
//return err and changeset
|
||||
function(err)
|
||||
{
|
||||
if(ERR(err, callback)) return;
|
||||
async.eachSeries(changesetsNeeded, function(r)
|
||||
async.eachSeries(changesetsNeeded, function(r, callback)
|
||||
{
|
||||
var forWire = Changeset.prepareForWire(changesets[r], pad.pool);
|
||||
var wireMsg = {"type":"COLLABROOM",
|
||||
|
@ -1216,7 +1234,8 @@ function handleClientReady(client, message)
|
|||
currentTime: changesetsTimestamp[r]
|
||||
}};
|
||||
client.json.send(wireMsg);
|
||||
});
|
||||
callback();
|
||||
});
|
||||
if (startNum == endNum)
|
||||
{
|
||||
var Msg = {"type":"COLLABROOM",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue