libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1760 from bemeric1/develop

Browse source 
Issue #1652: Fix to client-side-induced changeset spamming.
This commit is contained in:
John McLear 2013-04-28 13:11:34 -07:00
commit 9f2bab2ba3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2105,7 +2105,9 @@ exports.follow = function (cs1, cs2, reverseInsertOrder, pool) {
exports.copyOp(op2, opOut);
op2.opcode = '';
} else if (!op2.opcode) {
exports.copyOp(op1, opOut);
// @NOTE: Critical bugfix for EPL issue #1625. We do not copy op1 here
// in order to prevent attributes from leaking into result changesets.
// exports.copyOp(op1, opOut);
op1.opcode = '';
} else {
// both keeps