fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix few mistakes

This commit is contained in:
anugu-chegg 2018-02-16 01:31:47 +05:30 committed by muxator
parent d41e184a3c
commit 461ed413b7
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/node/handler/PadMessageHandler.js
View File

@ -1226,8 +1226,8 @@ function handleClientReady(client, message)
var forWire = Changeset.prepareForWire(changesets[r], pad.pool); var forWire = Changeset.prepareForWire(changesets[r], pad.pool);
var wireMsg = {"type":"COLLABROOM", var wireMsg = {"type":"COLLABROOM",
"data":{type:"CLIENT_RECONNECT", "data":{type:"CLIENT_RECONNECT",
currRev: r, headRev:pad.getHeadRevisionNumber(),
newRev:pad.getHeadRevisionNumber(), newRev:r,
changeset:forWire.translated, changeset:forWire.translated,
apool: forWire.pool, apool: forWire.pool,
author: changesetsAuthor[r], author: changesetsAuthor[r],
@ -1243,8 +1243,6 @@ function handleClientReady(client, message)
noChanges: true, noChanges: true,
newRev:pad.getHeadRevisionNumber() newRev:pad.getHeadRevisionNumber()
}}; }};
console.log("About to send client reconnect event");
client.json.send(Msg); client.json.send(Msg);
} }
}); });

55
src/static/js/collab_client.js
View File

@ -349,38 +349,53 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
return; return;
} }
var currRev = msg.currRev; var headRev = msg.headRev;
var newRev = msg.newRev; var newRev = msg.newRev;
var changeset = msg.changeset; var changeset = msg.changeset;
var author = (msg.author || ''); var author = (msg.author || '');
var apool = msg.apool; var apool = msg.apool;
if (rev + 1 == currRev) if (msgQueue.length > 0)
{ {
if (author == pad.getUserId()) if (newRev != (msgQueue[msgQueue.length - 1].newRev + 1))
{ {
editor.applyPreparedChangesetToBase(); window.console.warn("bad message revision on ACCEPT_COMMIT: " + newRev + " not " + (msgQueue[msgQueue.length - 1][0] + 1));
setStateIdle(); // setChannelState("DISCONNECTED", "badmessage_acceptcommit");
callCatchingErrors("onInternalAction", function() return;
{
callbacks.onInternalAction("commitAcceptedByServer");
});
callCatchingErrors("onConnectionTrouble", function()
{
callbacks.onConnectionTrouble("OK");
});
handleUserChanges();
}
else
{
editor.applyChangesToBase(changeset, author, apool);
} }
msg.type = "NEW_CHANGES";
msgQueue.push(msg);
return;
} }
if (rev + 1 < currRev)
if (newRev != (rev + 1))
{
window.console.warn("bad message revision on ACCEPT_COMMIT: " + newRev + " not " + (rev + 1));
// setChannelState("DISCONNECTED", "badmessage_acceptcommit");
return;
}
rev = newRev;
if (author == pad.getUserId())
{
editor.applyPreparedChangesetToBase();
setStateIdle();
callCatchingErrors("onInternalAction", function()
{
callbacks.onInternalAction("commitAcceptedByServer");
});
callCatchingErrors("onConnectionTrouble", function()
{
callbacks.onConnectionTrouble("OK");
});
handleUserChanges();
}
else
{ {
editor.applyChangesToBase(changeset, author, apool); editor.applyChangesToBase(changeset, author, apool);
} }
if (currRev == newRev)
if (newRev == headRev)
{ {
rev = newRev; rev = newRev;
socketIOError = false; socketIOError = false;