single-file-core 1.0.5 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.0.5",
+  "version": "1.0.8",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",
@@ -15,4 +15,4 @@
     "url": "https://github.com/gildas-lormeau/single-file-core/issues"
   },
   "homepage": "https://github.com/gildas-lormeau/single-file-core#readme"
-}
+}

package/single-file-core.js

@@ -95,6 +95,7 @@ const STAGES = [{
 		{ action: "preProcessPage" },
 		{ option: "loadDeferredImagesKeepZoomLevel", action: "resetZoomLevel" },
 		{ action: "replaceStyleContents" },
+		{ action: "replaceInvalidElements" },
 		{ action: "resetCharsetMeta" },
 		{ option: "saveFavicon", action: "saveFavicon" },
 		{ action: "replaceCanvasElements" },
@@ -795,6 +796,20 @@ class Processor {
 		this.doc.querySelectorAll("a[ping]").forEach(element => element.removeAttribute("ping"));
 	}
 
+	replaceInvalidElements() {
+		this.doc.querySelectorAll("template[" + util.INVALID_ELEMENT_ATTRIBUTE_NAME + "]").forEach(templateElement => {
+			const placeHolderElement = this.doc.createElement("span");
+			const originalElement = templateElement.content.firstChild;
+			if (originalElement) {
+				if (originalElement.hasAttributes()) {
+					Array.from(originalElement.attributes).forEach(attribute => placeHolderElement.setAttribute(attribute.name, attribute.value));
+				}
+				originalElement.childNodes.forEach(childNode => placeHolderElement.appendChild(childNode.cloneNode(true)));
+			}
+			templateElement.replaceWith(placeHolderElement);
+		});
+	}
+
 	resetCharsetMeta() {
 		let charset;
 		this.doc.querySelectorAll("meta[charset], meta[http-equiv=\"content-type\"]").forEach(element => {

package/single-file-helper.js

@@ -46,6 +46,7 @@ const LAZY_SRC_ATTRIBUTE_NAME = "data-single-file-lazy-loaded-src";
 const STYLESHEET_ATTRIBUTE_NAME = "data-single-file-stylesheet";
 const DISABLED_NOSCRIPT_ATTRIBUTE_NAME = "data-single-file-disabled-noscript";
 const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-single-file-selected-content";
+const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-single-file-invalid-element";
 const ASYNC_SCRIPT_ATTRIBUTE_NAME = "data-single-file-async-script";
 const FLOW_ELEMENTS_SELECTOR = "*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)";
 const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD"];
@@ -94,6 +95,7 @@ export {
 	LAZY_SRC_ATTRIBUTE_NAME,
 	STYLESHEET_ATTRIBUTE_NAME,
 	SELECTED_CONTENT_ATTRIBUTE_NAME,
+	INVALID_ELEMENT_ATTRIBUTE_NAME,
 	ASYNC_SCRIPT_ATTRIBUTE_NAME,
 	COMMENT_HEADER,
 	COMMENT_HEADER_LEGACY,
@@ -138,8 +140,10 @@ function preProcessDoc(doc, win, options) {
 	const invalidElements = new Map();
 	let elementsInfo;
 	if (win && doc.documentElement) {
-		doc.querySelectorAll("button button").forEach(element => {
-			const placeHolderElement = doc.createComment("");
+		doc.querySelectorAll("button button, a a, p div").forEach(element => {
+			const placeHolderElement = doc.createElement("template");
+			placeHolderElement.setAttribute(INVALID_ELEMENT_ATTRIBUTE_NAME, "");
+			placeHolderElement.content.appendChild(element.cloneNode(true));
 			invalidElements.set(element, placeHolderElement);
 			element.replaceWith(placeHolderElement);
 		});

package/single-file-util.js

@@ -186,6 +186,7 @@ function getInstance(utilOptions) {
 		PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME: helper.PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME,
 		STYLESHEET_ATTRIBUTE_NAME: helper.STYLESHEET_ATTRIBUTE_NAME,
 		SELECTED_CONTENT_ATTRIBUTE_NAME: helper.SELECTED_CONTENT_ATTRIBUTE_NAME,
+		INVALID_ELEMENT_ATTRIBUTE_NAME: helper.INVALID_ELEMENT_ATTRIBUTE_NAME,
 		COMMENT_HEADER: helper.COMMENT_HEADER,
 		COMMENT_HEADER_LEGACY: helper.COMMENT_HEADER_LEGACY,
 		SINGLE_FILE_UI_ELEMENT_CLASS: helper.SINGLE_FILE_UI_ELEMENT_CLASS,

package/single-file-frames.js

@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2022 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- * 
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or 
- *   modify it under the terms of the GNU Affero General Public License 
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- * 
- *   The code in this file is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may 
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
- *   AGPL normally required by section 4, provided you include this license 
- *   notice and a URL through which recipients can access the Corresponding 
- *   Source.
- */
-
-import "./processors/frame-tree/content/content-frame-tree.js";