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

fix tests and better dingdong

Browse source
This commit is contained in:
John McLear 2021-01-03 11:51:35 +00:00
parent eba5827092
commit 8803c23a2d
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/scroll.js
View file

@ -434,7 +434,9 @@ Scroll.prototype.getCountOfVisibleCharsInViewport = (line, viewport) => {
// each character // each character
let i = 0; let i = 0;
console.log(node); console.log(node);
if (!node || !node.childNodes) return;
node = node.childNodes[0]; node = node.childNodes[0];
if (!node) return; // temp patch to be removed.
if (node.childNodes && node.childNodes[1].length === 0) return; if (node.childNodes && node.childNodes[1].length === 0) return;
console.log(node); console.log(node);
console.log(node.wholeText.length); console.log(node.wholeText.length);

23
tests/frontend/specs/pageupdown.js
View file

@ -11,27 +11,26 @@ describe('Page Up & Page Down', function () {
'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' + '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' +
'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' + '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' +
'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' + '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' +
'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'); '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nhello');
cb(); cb();
}, },
}); });
}); });
// scrolls up 3 times // scrolls up 2 times
it('scrolls up on key stroke', async function () { it('scrolls up on key stroke', async function () {
let currentLineNumber = helper.caretLineNumber(); await helper.edit('Line 80', 80);
await helper.waitForPromise(() => 81 === helper.caretLineNumber());
// for some reason the page isn't inline with the edit
helper.padOuter$('#outerdocbody').parent().scrollTop(1000);
let intitialLineNumber = helper.caretLineNumber();
helper.pageUp(); helper.pageUp();
await helper.waitForPromise(() => currentLineNumber > helper.caretLineNumber()); await helper.waitForPromise(() => intitialLineNumber > helper.caretLineNumber());
intitialLineNumber = helper.caretLineNumber();
currentLineNumber = helper.caretLineNumber();
helper.pageUp(); helper.pageUp();
await helper.waitForPromise(() => currentLineNumber > helper.caretLineNumber()); await helper.waitForPromise(() => intitialLineNumber > helper.caretLineNumber());
await helper.waitForPromise(() => helper.padOuter$('#outerdocbody').parent().scrollTop() < 1000);
currentLineNumber = helper.caretLineNumber();
helper.pageUp();
await helper.waitForPromise(() => currentLineNumber > helper.caretLineNumber());
}); });
// scrolls down 3 times // scrolls down 3 times
it('scrolls down on key stroke', async function () { it('scrolls down on key stroke', async function () {
// this places the caret in the first line // this places the caret in the first line