libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity

new approach #1721874828748974124124

Browse source
This commit is contained in:
John McLear 2021-01-02 14:55:19 +00:00
parent 66d3d6a02d
commit 8e5c124f5e
2 changed files with 87 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
src/static/js/ace2_inner.js
View file

@ -3064,9 +3064,6 @@ function Ace2Inner() {
// and the default behavior SUCKS // and the default behavior SUCKS
evt.preventDefault(); evt.preventDefault();
const visibleLineRange = scroll.getVisibleLineRange(rep);
const partiallyVisibleLineRange = scroll.getPartiallyVisibleLineRange(rep);
const isPageDown = evt.which === 34; const isPageDown = evt.which === 34;
const isPageUp = evt.which === 33; const isPageUp = evt.which === 33;
const linesLength = rep.lines.length(); const linesLength = rep.lines.length();
@ -3112,160 +3109,52 @@ function Ace2Inner() {
*/ */
return 1000; return 1000;
}; };
/*
if (isPageUp) { if (isPageUp) {
// would the new location be before the document? // Approach #99991248928174 to solve this problem....
// top.console.log(rep.selEnd[0] - (visibleLineRange[1] - visibleLineRange[0])); scroll.movePage('up');
const targetLine = rep.selEnd[0] - (visibleLineRange[1] - visibleLineRange[0]); const firstVisible = scroll.getFirstVisibleCharacter('up', rep);
const beforeViewport = targetLine <= 0; rep.selStart[0] = firstVisible;
// top.console.log('beforeVP', beforeViewport); rep.selEnd[0] = firstVisible;
// top.console.log('highlighting', highlighting);
// top.console.log('shitKey', shiftKey);
// if page up is above view port.
if (beforeViewport || targetLine === 1) {
if (!shiftKey || highlighting) {
rep.selEnd = [0, 0];
rep.selStart = [0, 0];
}
} else {
// not above view port, so selection within visible document
if (!shiftKey || highlighting) {
rep.selStart[0] -= visibleLineRange[1] - visibleLineRange[0];
rep.selEnd[0] -= visibleLineRange[1] - visibleLineRange[0];
let line;
// need current character length of line
try {
line = rep.lines.atIndex(rep.selEnd[0]);
} catch (e) {
// silently fail, no big deal.. But this could be better
line = rep.lines.atIndex(visibleLineRange[1]);
}
const lineLength = line.width;
// Keep the X character offset on page down
if (previousCharacterOffset <= line.width) {
rep.selStart[1] = previousCharacterOffset;
rep.selEnd[1] = previousCharacterOffset;
}
}
}
} }
*/
if (isPageUp) {
// boolean - Can the editor see the next line?
let previousLineIsVisibleInViewport = rep.selStart[0] <= visibleLineRange[1];
top.console.log('previousLineIsVisibleInViewport ', previousLineIsVisibleInViewport, rep.selStart[0], visibleLineRange);
// boolean is partial of the next line visible at least?
const previousLineIsPartiallyVisibleLineRange = rep.selStart[0] < partiallyVisibleLineRange[1]; // cake
if (previousLineIsPartiallyVisibleLineRange) previousLineIsVisibleInViewport = true;
// lines that are very long might fill the entire page.
// if we can't see the end of the current line (IE see the next line)
// then we need to scroll the X position, not the Y
if (!previousLineIsVisibleInViewport) {
top.console.log('line too long, can nott see the previous line');
// TODO JM CAKE: Figure out how many chars are visible in viewport.
const visibleCharsInViewport =
getVisibleCharRangeOfLineInViewport(rep.lines.atIndex(rep.selStart[0]));
rep.selStart[1] -= visibleCharsInViewport;
rep.selEnd[1] -= visibleCharsInViewport;
}
if (previousLineIsVisibleInViewport) {
let line;
// need current character length of line
try {
line = rep.lines.atIndex(rep.selStart[0]);
} catch (e) {
// silently fail, no big deal..
line = rep.lines.atIndex(partiallyVisibleLineRange[1]);
}
// Keep the X character offset on page down
if (previousCharacterOffset <= line.width) {
top.console.log('previousCharacterOffset', previousCharacterOffset);
if (!shiftKey) rep.selStart[1] = previousCharacterOffset;
rep.selEnd[1] = previousCharacterOffset;
}
if (!shiftKey) rep.selStart[0] = rep.selStart[0] - (partiallyVisibleLineRange[1] - visibleLineRange[0]);
rep.selEnd[0] = rep.selEnd[0] - (partiallyVisibleLineRange[1] - visibleLineRange[0]);
// if the new rep is before the viewport
// put the caret on the first line at the end of the line
if (rep.selStart[0] <= 0) {
top.console.log('putting caret on the first line at the end of the line', rep.selStart[0], linesLength - 1);
rep.selStart = [0, 0];
if (!shiftKey) rep.selEnd = [0, 0];
}
}
}
if (isPageDown) { if (isPageDown) {
// boolean - Can the editor see the next line? /** *
let nextLineIsVisibleInViewport = rep.selEnd[0] <= visibleLineRange[1]; * Bottom of document - do nothing if we are at the very end
*/
// JM TODO: Check if Linemarker modifies width..
const lengthOfLastLine = rep.lines.atIndex(rep.selEnd[0]).width - 1;
const endOfLine = lengthOfLastLine === rep.selEnd[1];
const atBottom = (rep.lines.length() - 1) === rep.selEnd[0];
// If we are right at the bottom of the document, no need to continue
if (atBottom && endOfLine) return;
// boolean is partial of the next line visible at least?
const nextLineIsPartiallyVisibleLineRange = rep.selEnd[0] < partiallyVisibleLineRange[1]; // cake
if (nextLineIsPartiallyVisibleLineRange) nextLineIsVisibleInViewport = true;
// lines that are very long might fill the entire page. /** *
// if we can't see the end of the current line (IE see the next line) * Move the actual view
// then we need to scroll the X position, not the Y */
if (!nextLineIsVisibleInViewport) {
top.console.log('line too long, can nott see the next line');
// TODO JM CAKE: Figure out how many chars are visible in viewport.
const visibleCharsInViewport =
getVisibleCharRangeOfLineInViewport(rep.lines.atIndex(rep.selEnd[0]));
rep.selStart[1] += visibleCharsInViewport;
rep.selEnd[1] += visibleCharsInViewport;
}
if (nextLineIsVisibleInViewport) { scroll.movePage('down');
let line;
// need current character length of line /** *
try { * Move the caret
line = rep.lines.atIndex(rep.selEnd[0]); */
} catch (e) {
// silently fail, no big deal.. const firstVisible = scroll.getFirstVisibleCharacter('down', rep);
line = rep.lines.atIndex(partiallyVisibleLineRange[1]); top.console.log('fB', firstVisible);
} top.console.log(rep.lines.length());
// Keep the X character offset on page down
if (previousCharacterOffset <= line.width) { if (rep.selStart[0] === firstVisible) {
top.console.log('previousCharacterOffset', previousCharacterOffset); // we're at the bottom
if (!shiftKey) rep.selStart[1] = previousCharacterOffset; rep.selStart[0] = rep.lines.length() - 1;
rep.selEnd[1] = previousCharacterOffset; rep.selEnd[0] = rep.lines.length() - 1;
} rep.selStart[1] = rep.lines.atIndex(rep.selStart[0]).length;
if (!shiftKey) rep.selStart[0] = rep.selStart[0] + (partiallyVisibleLineRange[1] - visibleLineRange[0]); rep.selEnd[1] = rep.lines.atIndex(rep.selStart[0]).length;
rep.selEnd[0] = rep.selEnd[0] + (partiallyVisibleLineRange[1] - visibleLineRange[0]); } else {
// if the new rep is beyond the viewport rep.selStart[0] = firstVisible;
// put the caret on the last line at the end of the line rep.selEnd[0] = firstVisible;
if (rep.selStart[0] >= (linesLength - 1)) {
top.console.log('putting caret on the last line at the end of the line', rep.selStart[0], linesLength - 1);
let line;
// need current character length of line
try {
line = rep.lines.atIndex(rep.selEnd[0]);
} catch (e) {
// silently fail, no big deal..
line = rep.lines.atIndex(visibleLineRange[1]);
}
let lineLength;
// if the last line is a blank line then don't throw an error.
if (line) {
lineLength = line.width;
} else {
lineLength = 0;
}
if (!shiftKey) rep.selStart = [linesLength - 1, lineLength];
rep.selEnd = [linesLength - 1, lineLength];
}
} }
} }
updateBrowserSelectionFromRep(); // works updateBrowserSelectionFromRep();
scroll.scrollNodeVerticallyIntoView(null, null, isPageUp, isPageDown);
// TODO: always slightly off...
// TODO: if enough content is visible below show all of that content
} }
// scroll to viewport when user presses arrow keys and caret is out of the viewport // scroll to viewport when user presses arrow keys and caret is out of the viewport

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

@ -346,4 +346,54 @@ Scroll.prototype.getVisibleCharRange = function (rep) {
return [rep.lines.offsetOfIndex(lineRange[0]), rep.lines.offsetOfIndex(lineRange[1])]; return [rep.lines.offsetOfIndex(lineRange[0]), rep.lines.offsetOfIndex(lineRange[1])];
}; };
// moves viewport to next page
Scroll.prototype.movePage = function (direction) {
const viewport = this._getViewPortTopBottom();
// linePosition contains top and bottom, might be useful
// if the buffer of a fixed value isn't working as intended
const linePosition = caretPosition.getPosition();
const buffer = 25;
let pixelsToScroll = viewport.top - viewport.bottom;
if (direction === 'up') {
// buffer pixels unscrolled our safety net here. You can't use the current or previous
// line height because it might be a very long line..
pixelsToScroll = -Math.abs(pixelsToScroll + buffer);
} else {
pixelsToScroll = Math.abs(pixelsToScroll + buffer);
}
this.outerWin.scrollBy(0, pixelsToScroll);
return;
};
Scroll.prototype.getFirstVisibleCharacter = function (direction) {
const viewport = this._getViewPortTopBottom();
console.log('viewport', viewport);
const editor = parent.document.getElementsByTagName('iframe');
const lines = $(editor).contents().find('div');
let goToLine = 0;
$.each(lines, (index, line) => {
const lineTopOffset = $(line).offset().top;
// console.log(index, line);
// console.log($(line).offset().top);
// console.log(index, 'lineTopOffset', lineTopOffset);
// console.log('viewport.top', viewport.top);
// is each line in the viewport?
// JM TODO Long lines...
if (lineTopOffset > viewport.top) {
// top.console.log('returning', index);
goToLine = index;
return false;
}
});
// go to this rep.
return goToLine;
};
exports.init = (outerWin) => new Scroll(outerWin); exports.init = (outerWin) => new Scroll(outerWin);