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

pluginfw: Make the NEW_CHANGES payload include the message in handleClientMessage

Browse source
This commit is contained in:
John McLear 2020-06-12 12:26:33 +01:00 • committed by GitHub
parent 85383a316d
commit 045ac70db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -309,6 +309,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
return; return;
} }
rev = newRev; rev = newRev;
editor.applyChangesToBase(changeset, author, apool); editor.applyChangesToBase(changeset, author, apool);
} }
else if (msg.type == "ACCEPT_COMMIT") else if (msg.type == "ACCEPT_COMMIT")
@ -508,6 +509,9 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
if(msg.type.indexOf("USER_") > -1) { if(msg.type.indexOf("USER_") > -1) {
msg.payload = msg.userInfo; msg.payload = msg.userInfo;
} }
// Similar for NEW_CHANGES
if(msg.type === "NEW_CHANGES") msg.payload = msg;
hooks.callAll('handleClientMessage_' + msg.type, {payload: msg.payload}); hooks.callAll('handleClientMessage_' + msg.type, {payload: msg.payload});
} }