Просмотр исходного кода

avoid setting innerHTML value

Former-commit-id: b52f98e6a701092a633da1068c769c6a5cf1f755
Gildas 6 лет назад
Родитель
Сommit
0641fd49cd
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      lib/single-file/modules/html-serializer.js
  2. 2 2
      lib/single-file/single-file-helper.js

+ 1 - 1
lib/single-file/modules/html-serializer.js

@@ -117,7 +117,7 @@ this.singlefile.lib.modules.serializer = this.singlefile.lib.modules.serializer
 			content += ">";
 			content += ">";
 		}
 		}
 		if (element.tagName == "TEMPLATE") {
 		if (element.tagName == "TEMPLATE") {
-			content += element.innerHTML;
+			content += element.innerHTML || element.textContent;
 		} else {
 		} else {
 			Array.from(element.childNodes).forEach(childNode => content += serialize(childNode, compressHTML));
 			Array.from(element.childNodes).forEach(childNode => content += serialize(childNode, compressHTML));
 		}
 		}

+ 2 - 2
lib/single-file/single-file-helper.js

@@ -94,7 +94,7 @@ this.singlefile.lib.helper = this.singlefile.lib.helper || (() => {
 		doc.querySelectorAll("noscript").forEach(element => {
 		doc.querySelectorAll("noscript").forEach(element => {
 			const disabledNoscriptElement = doc.createElement("template");
 			const disabledNoscriptElement = doc.createElement("template");
 			disabledNoscriptElement.setAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME, "");
 			disabledNoscriptElement.setAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME, "");
-			disabledNoscriptElement.innerHTML = element.textContent;
+			disabledNoscriptElement.textContent = element.textContent;
 			element.parentElement.replaceChild(disabledNoscriptElement, element);
 			element.parentElement.replaceChild(disabledNoscriptElement, element);
 		});
 		});
 		initDoc(doc);
 		initDoc(doc);
@@ -312,7 +312,7 @@ this.singlefile.lib.helper = this.singlefile.lib.helper || (() => {
 	function postProcessDoc(doc, markedElements) {
 	function postProcessDoc(doc, markedElements) {
 		doc.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
 		doc.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
 			const noscriptElement = doc.createElement("noscript");
 			const noscriptElement = doc.createElement("noscript");
-			noscriptElement.textContent = element.innerHTML;
+			noscriptElement.textContent = element.innerHTML || element.textContent;
 			element.parentElement.replaceChild(noscriptElement, element);
 			element.parentElement.replaceChild(noscriptElement, element);
 		});
 		});
 		doc.querySelectorAll("meta[disabled-http-equiv]").forEach(element => {
 		doc.querySelectorAll("meta[disabled-http-equiv]").forEach(element => {