Merge branch 'timeslider' of git://github.com/Pita/etherpad-lite into timeslider

This commit is contained in:
Peter 'Pita' Martischka 2011-06-21 15:11:44 +01:00
commit 247462e2f8
3 changed files with 11 additions and 13 deletions

View File

@ -81,6 +81,7 @@ exports.handleMessage = function(client, message)
function handleClientReady(client, message)
{
//send the timeslider client the clientVars, with this values its able to start
createTimesliderClientVars (message.padId, function(err, clientVars)
{
if(err) throw err;
@ -89,6 +90,9 @@ function handleClientReady(client, message)
})
}
/**
* Handles a request for a rough changeset, the timeslider client needs it
*/
function handleChangesetRequest(client, message)
{
var granularity = message.data.granularity;
@ -96,6 +100,7 @@ function handleChangesetRequest(client, message)
var end = start + (100 * granularity);
var padId = message.padId;
//build the requested rough changesets and send them back
getChangesetInfo(padId, start, end, granularity, function(err, changesetInfo)
{
if(err) throw err;

View File

@ -120,14 +120,3 @@ function loadBroadcastRevisionsJS()
};
}
}
// revisionInfo.addChangeset(0, 5, "abcde")
// revisionInfo.addChangeset(5, 10, "fghij")
// revisionInfo.addChangeset(10, 11, "k")
// revisionInfo.addChangeset(11, 12, "l")
// revisionInfo.addChangeset(12, 13, "m")
// revisionInfo.addChangeset(13, 14, "n")
// revisionInfo.addChangeset(14, 15, "o")
// revisionInfo.addChangeset(15, 20, "pqrst")
//
// print (revisionInfo.getPath(15, 0))

File diff suppressed because one or more lines are too long