libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: better timeslider follow contents (#4421)

This commit is contained in:
webzwo0i 2020-10-21 11:05:58 +02:00 committed by GitHub
parent 0eb0a07914
commit 1e7a9e1791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/static/js/broadcast.js
View File

@ -245,6 +245,7 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
BroadcastSlider.setSliderPosition(revision);
}
let oldAlines = padContents.alines.slice();
try
{
// must mutate attribution lines before text lines
@ -255,15 +256,25 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
debugLog(e);
}
// we want to scroll to the area that is changed before the lines are mutated and we can't go
// to a line that is not there yet
let lineNumber = Changeset.opIterator(Changeset.unpack(changeset).ops).next().lines;
// scroll to the area that is changed before the lines are mutated
if($('#options-followContents').is(":checked") || $('#options-followContents').prop("checked")){
if(padContents.currentLines.length <= lineNumber){
goToLineNumber(padContents.currentLines.length-1)
} else {
goToLineNumber(lineNumber);
// get the index of the first line that has mutated attributes
// the last line in `oldAlines` should always equal to "|1+1", ie newline without attributes
// so it should be safe to assume this line has changed attributes when inserting content at
// the bottom of a pad
let lineChanged;
_.some(oldAlines, function(line, index){
if(line !== padContents.alines[index]){
lineChanged = index;
return true; // break
}
})
// deal with someone is the author of a line and changes one character, so the alines won't change
if(lineChanged === undefined) {
lineChanged = Changeset.opIterator(Changeset.unpack(changeset).ops).next().lines;
}
goToLineNumber(lineChanged);
}
Changeset.mutateTextLines(changeset, padContents);