mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed merge conflicts.

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-05-16 16:28:58 +01:00
commit 89fdd0a9b9
6 changed files with 167 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

12
node/MessageHandler.js
View file

@ -258,11 +258,11 @@ function handleUserChanges(client, message)
//ex. adoptChangesetAttribs
//Afaik, it copies the new attributes from the changeset, to the global Attribute Pool
changeset = Changeset.moveOpsToNewPool(changeset, wireApool, pad.pool());
changeset = Changeset.moveOpsToNewPool(changeset, wireApool, pad.pool);
//ex. applyUserChanges
var apool = pad.pool();
var apool = pad.pool;
var r = baseRev;
while (r < pad.getHeadRevisionNumber()) {
@ -281,7 +281,7 @@ function handleUserChanges(client, message)
pad.appendRevision(changeset, thisAuthor);
var correctionChangeset = _correctMarkersInPad(pad.atext(), pad.pool());
var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) {
pad.appendRevision(correctionChangeset);
}
@ -310,7 +310,7 @@ function handleUserChanges(client, message)
}
else
{
var forWire = Changeset.prepareForWire(pad.getRevisionChangeset(r), pad.pool());
var forWire = Changeset.prepareForWire(pad.getRevisionChangeset(r), pad.pool);
var wireMsg = {"type":"COLLABROOM","data":{type:"NEW_CHANGES", newRev:r,
changeset: forWire.translated,
apool: forWire.pool,
@ -462,8 +462,8 @@ function handleClientReady(client, message)
var pad = padManager.getPad(message.padId, false);
//prepare all values for the wire
atext = pad.atext();
var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool());
atext = pad.atext;
var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool);
var apool = attribsForWire.pool.toJsonable();
atext.attribs = attribsForWire.translated;