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

Merge 17b6103a3d into d18bb81aad

Browse source
This commit is contained in:
GitHub Merge Button 2012-07-05 10:34:27 -07:00
commit 56571f9feb
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1062,10 +1062,19 @@ function handleChangesetRequest(client, message)
var granularity = message.data.granularity;
var start = message.data.start;
var end = start + (100 * granularity);
var padId = message.padId;
var padIds;
async.series([
function (callback) {
readOnlyManager.getIds(message.padId, function(err, value) {
if(ERR(err, callback)) return;
padIds = value;
callback();
});
},
function (callback) {
//build the requested rough changesets and send them back
getChangesetInfo(padId, start, end, granularity, function(err, changesetInfo)
getChangesetInfo(padIds.padId, start, end, granularity, function(err, changesetInfo)
{
ERR(err);
@ -1075,6 +1084,8 @@ function handleChangesetRequest(client, message)
client.json.send({type: "CHANGESET_REQ", data: data});
});
}
]);
}
/**