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

undomodule: disallow undoing "clear authorship colors"

Browse source 
Clearing the authorship colors of a document with at least two authors, and then
undoing that action caused a disconnect from the pad.
This change disallows undoing clearing authorship colors in order to prevent
the problem from affecting users, and adds the relative test coverage.

This is a change of behaviour, and is documented in the changelog.

Fixes #2802 (sidestepping it).
This commit is contained in:
John McLear 2020-04-07 00:39:43 +02:00 • committed by muxator
parent ffc718e8c0
commit babf67175c
8 changed files with 90 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/static/js/undomodule.js
View file

@ -253,7 +253,15 @@ var undoModule = (function()
}
if (!merged)
{
stack.pushEvent(event);
/*
* Push the event on the undo stack only if it exists, and if it's
* not a "clearauthorship". This disallows undoing the removal of the
* authorship colors, but is a necessary stopgap measure against
* https://github.com/ether/etherpad-lite/issues/2802
*/
if (event && (event.eventType !== "clearauthorship")) {
stack.pushEvent(event);
}
}
undoPtr = 0;
}