Gildas 6 лет назад
Родитель
Сommit
65f5247a56
1 измененных файлов с 5 добавлено и 5 удалено
  1. 5 5
      lib/single-file/util/doc-helper.js

+ 5 - 5
lib/single-file/util/doc-helper.js

@@ -82,7 +82,7 @@ this.docHelper = this.docHelper || (() => {
 						ignoredTags = ignoredTags.concat("SCRIPT");
 					}
 					markHiddenCandidates(win, doc.body, elementsInfo, false, new Set(), ignoredTags);
-					markHiddenElements(win, doc.body, elementsInfo, imageData);
+					markHiddenElements(win, doc.body, imageData);
 					doc.querySelectorAll("iframe").forEach(element => {
 						if (element.getBoundingClientRect) {
 							const boundingRect = element.getBoundingClientRect();
@@ -180,9 +180,9 @@ this.docHelper = this.docHelper || (() => {
 		});
 	}
 
-	function markHiddenCandidates(win, element, styles, elementHidden, removedCandidates, ignoredTags) {
+	function markHiddenCandidates(win, element, elementsInfo, elementHidden, removedCandidates, ignoredTags) {
 		const elements = Array.from(element.childNodes).filter(node => node instanceof win.HTMLElement);
-		elements.forEach(element => markHiddenCandidates(win, element, styles, elementHidden || testHiddenElement(element, styles.get(element)), removedCandidates, ignoredTags));
+		elements.forEach(element => markHiddenCandidates(win, element, elementsInfo, elementHidden || testHiddenElement(element, elementsInfo.get(element)), removedCandidates, ignoredTags));
 		if (elementHidden && !ignoredTags.includes(element.tagName)) {
 			if (elements.length) {
 				if (!elements.find(element => !removedCandidates.has(element))) {
@@ -195,7 +195,7 @@ this.docHelper = this.docHelper || (() => {
 		}
 	}
 
-	function markHiddenElements(win, element, styles, imageData) {
+	function markHiddenElements(win, element, imageData) {
 		const elements = Array.from(element.childNodes).filter(node => node.nodeType == win.Node.ELEMENT_NODE);
 		if (element.getAttribute(REMOVED_CONTENT_ATTRIBUTE_NAME) == "") {
 			element.removeAttribute(REMOVED_CONTENT_ATTRIBUTE_NAME);
@@ -206,7 +206,7 @@ this.docHelper = this.docHelper || (() => {
 				}
 			}
 		} else {
-			elements.forEach(element => markHiddenElements(win, element, styles, imageData));
+			elements.forEach(element => markHiddenElements(win, element, imageData));
 		}
 	}