infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix cursor recovery in pad

pull/1/head
yflory 2020-04-22 18:43:12 +02:00
parent 97f41edd94
commit 0a72ed2977
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/cursor-treesome.js
View File

@ -3,7 +3,7 @@ define([], function () {
var indexOfNode = tree.indexOfNode = function (el) {
if (!(el && el.parentNode)) {
console.log("No parentNode found!");
console.log("No parentNode found!", el);
throw new Error('No parentNode found!');
}
return Array.prototype.indexOf.call(el.parentNode.childNodes, el);
@ -26,6 +26,7 @@ define([], function () {
leaf nodes of a tree
*/
var rightmostNode = tree.rightmostNode = function (el) {
if (!el) { return null; }
var childNodeCount = childCount(el);
if (!childNodeCount) { // no children
return el; // return the element
@ -53,7 +54,7 @@ define([], function () {
if (!el.parentNode) { return null; }
if (i === 0) {
if (root && el.parentNode === root.childNodes[0]) { return null; }
return rightmostNode(previousNode(el.parentNode));
return rightmostNode(previousNode(el.parentNode, root));
} else {
return rightmostNode(el.parentNode.childNodes[i-1]);
}
@ -77,6 +78,10 @@ define([], function () {
// a and b might be the same element
if (a === b) { return 0; }
// If we're selecting an entire node containing a single text node,
// b can be the child of a. Order is correct.
if (b.parentNode && b.parentNode === a) { return 1; }
var cur = b;
while (cur) {
cur = previousNode(cur, root);