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

Merge branch 'develop' of github.com:ether/etherpad-lite into mochawesome

Browse source
This commit is contained in:
John McLear 2021-01-28 12:21:53 +00:00
commit 360f32aa13
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/db/Pad.js
View file

@ -418,7 +418,7 @@ Pad.prototype.copy = async function copy(destinationID, force) {
await padManager.getPad(destinationID, null); // this runs too early. await padManager.getPad(destinationID, null); // this runs too early.
// let the plugins know the pad was copied // let the plugins know the pad was copied
hooks.callAll('padCopy', {originalPad: this, destinationID}); await hooks.aCallAll('padCopy', {originalPad: this, destinationID});
return {padID: destinationID}; return {padID: destinationID};
}; };
@ -520,7 +520,7 @@ Pad.prototype.copyPadWithoutHistory = async function copyPadWithoutHistory(desti
const changeset = Changeset.pack(oldLength, newLength, assem.toString(), newText); const changeset = Changeset.pack(oldLength, newLength, assem.toString(), newText);
newPad.appendRevision(changeset); newPad.appendRevision(changeset);
hooks.callAll('padCopy', {originalPad: this, destinationID}); await hooks.aCallAll('padCopy', {originalPad: this, destinationID});
return {padID: destinationID}; return {padID: destinationID};
}; };
@ -574,7 +574,7 @@ Pad.prototype.remove = async function remove() {
// delete the pad entry and delete pad from padManager // delete the pad entry and delete pad from padManager
p.push(padManager.removePad(padID)); p.push(padManager.removePad(padID));
hooks.callAll('padRemove', {padID}); p.push(hooks.aCallAll('padRemove', {padID}));
await Promise.all(p); await Promise.all(p);
}; };

1
src/tests Symbolic link
View file

@ -0,0 +1 @@
../tests