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

Send commits missed during the reconnect

Browse source
This commit is contained in:
anugu-chegg 2018-02-14 13:18:44 +05:30 • committed by muxator
parent bf05e9ae89
commit d41e184a3c
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/static/js/collab_client.js
View file

@ -342,6 +342,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
}
else if (msg.type == 'CLIENT_RECONNECT')
{
// When client has reconnected but there are no pending changes from other clients
if (msg.noChanges)
{
socketIOError = false;
@ -354,19 +355,26 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var author = (msg.author || '');
var apool = msg.apool;
if (rev + 1 == currRev)
{
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);
}
}
if (rev + 1 < currRev)
{
@ -374,8 +382,8 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
}
if (currRev == newRev)
{
socketIOError = false;
rev = newRev;
socketIOError = false;
}
}
else if (msg.type == "NO_COMMIT_PENDING")