mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1582585 - Use flattenedTreeParentNode in AutoScrollController.jsm. r=botond 

This makes it work with both Shadow DOM and XBL.

Differential Revision: https://phabricator.services.mozilla.com/D46729

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-09-23 15:52:55 +00:00
Родитель 4c429b8f4e
Коммит 243aae81a3
1 изменённых файлов: 1 добавлений и 41 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

42
toolkit/modules/AutoScrollController.jsm
Просмотреть файл

@ -108,51 +108,11 @@ class AutoScrollController {
return null; return null;
} }
getXBLNodes(parent, array) {
let content = parent.ownerGlobal;
let anonNodes = content.document.getAnonymousNodes(parent);
let nodes = Array.from(anonNodes || parent.childNodes || []);
for (let node of nodes) {
if (node.nodeName == "children") {
return true;
}
if (this.getXBLNodes(node, array)) {
array.push(node);
return true;
}
}
return false;
}
*parentNodeIterator(aNode) {
let content = aNode.ownerGlobal;
while (aNode) {
yield aNode;
let parent = aNode.parentNode;
if (parent && parent instanceof content.XULElement) {
let anonNodes = content.document.getAnonymousNodes(parent);
if (anonNodes && !Array.from(anonNodes).includes(aNode)) {
// XBL elements are skipped by parentNode property.
// Yield elements between parent and <children> here.
let nodes = [];
this.getXBLNodes(parent, nodes);
for (let node of nodes) {
yield node;
}
}
}
aNode = parent;
}
}
findNearestScrollableElement(aNode) { findNearestScrollableElement(aNode) {
// go upward in the DOM and find any parent element that has a overflow // go upward in the DOM and find any parent element that has a overflow
// area and can therefore be scrolled // area and can therefore be scrolled
this._scrollable = null; this._scrollable = null;
for (let node of this.parentNodeIterator(aNode)) { for (let node = aNode; node; node = node.flattenedTreeParentNode) {
// do not use overflow based autoscroll for <html> and <body> // do not use overflow based autoscroll for <html> and <body>
// Elements or non-html/non-xul elements such as svg or Document nodes // Elements or non-html/non-xul elements such as svg or Document nodes
// also make sure to skip select elements that are not multiline // also make sure to skip select elements that are not multiline