mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

contentcollector: Fix iteration over child Nodes

Browse source 
In the DOM, `.children` only includes children that are Element
objects. In cheerio 0.22.0, `.children` includes all child Nodes, not
just Elements. Use `dom.numChildNodes()` and `dom.childNode()` so that
browsers behave the same as cheerio.
This commit is contained in:
Richard Hansen 2021-01-24 18:50:50 -05:00 • committed by John McLear
parent d0bfb54c0a
commit fc2420c244
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/static/js/contentcollector.js
View file

@ -496,16 +496,8 @@ const makeContentCollector = (collectStyles, abrowser, apool, className2Author)
// lists do not need to have a type, so before we make a wrong guess // lists do not need to have a type, so before we make a wrong guess
// check if we find a better hint within the node's children // check if we find a better hint within the node's children
if (!rr && !type) { if (!rr && !type) {
// If `node` is from the DOM (not cheerio) then it implements the ParentNode interface for (let i = 0; i < dom.numChildNodes(node); i++) {
// and `node.children` is a HTMLCollection. The DOM + Web IDL specs guarantee that const child = dom.childNode(node, i);
// HTMLCollection implements the iterable protocol, so for..of iteration should always
// work. See: https://stackoverflow.com/a/41759532. Cheerio behaves the same with
// regard to iteration.
//
// TODO: The set of Nodes included in node.children differs between the DOM and
// cheerio 0.22.0: cheerio includes all child Nodes (including non-Element Nodes)
// whereas the DOM only includes Nodes that are Elements.
for (const child of node.children) {
if (child && child.name === 'ul') { if (child && child.name === 'ul') {
type = dom.getAttribute(child, 'class'); type = dom.getAttribute(child, 'class');
if (type) { if (type) {