public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changeset: Improve handling of missing attribute in old pool

pull/5268/head
Richard Hansen 2021-10-25 05:19:35 -04:00
parent b62534a6b2
commit 4f4a775d9e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/static/js/Changeset.js
View File

@ -1563,18 +1563,10 @@ exports.moveOpsToNewPool = (cs, oldPool, newPool) => {
// order of attribs stays the same // order of attribs stays the same
return upToDollar.replace(/\*([0-9a-z]+)/g, (_, a) => { return upToDollar.replace(/\*([0-9a-z]+)/g, (_, a) => {
const oldNum = exports.parseNum(a); const oldNum = exports.parseNum(a);
let pair = oldPool.getAttrib(oldNum); const pair = oldPool.getAttrib(oldNum);
// The attribute might not be in the old pool if the user is viewing the current revision in the
/* // timeslider and text is deleted. See: https://github.com/ether/etherpad-lite/issues/3932
* Setting an empty pair. Required for when delete pad contents / attributes if (!pair) return '';
* while another user has the timeslider open.
*
* Fixes https://github.com/ether/etherpad-lite/issues/3932
*/
if (!pair) {
pair = [];
}
const newNum = newPool.putAttrib(pair); const newNum = newPool.putAttrib(pair);
return `*${exports.numToString(newNum)}`; return `*${exports.numToString(newNum)}`;
}) + fromDollar; }) + fromDollar;