Selaa lähdekoodia

renamed shadowRootsData property

Gildas 6 vuotta sitten
vanhempi
sitoutus
c4eed9a35b

+ 1 - 1
extension/core/bg/autosave.js

@@ -95,7 +95,7 @@ singlefile.autosave = (() => {
 		options.imageData = message.imageData;
 		options.postersData = message.postersData;
 		options.usedFonts = message.usedFonts;
-		options.shadowRootContents = message.shadowRootContents;
+		options.shadowRootsData = message.shadowRootsData;
 		options.referrer = message.referrer;
 		options.insertSingleFileComment = true;
 		options.insertFaviconLink = true;

+ 2 - 2
extension/core/content/content-bootstrap.js

@@ -75,7 +75,7 @@ this.singlefile.bootstrap = this.singlefile.bootstrap || (async () => {
 					imageData: docData.imageData,
 					postersData: docData.postersData,
 					usedFonts: docData.usedFonts,
-					shadowRootContents: docData.shadowRootContents,
+					shadowRootsData: docData.shadowRootsData,
 					referrer: docData.referrer,
 					framesData,
 					url: location.href
@@ -117,7 +117,7 @@ this.singlefile.bootstrap = this.singlefile.bootstrap || (async () => {
 				imageData: docData.imageData,
 				postersData: docData.postersData,
 				usedFonts: docData.usedFonts,
-				shadowRootContents: docData.shadowRootContents,
+				shadowRootsData: docData.shadowRootsData,
 				referrer: docData.referrer,
 				framesData,
 				url: location.href

+ 1 - 1
extension/core/content/content.js

@@ -145,7 +145,7 @@ this.singlefile.top = this.singlefile.top || (() => {
 			options.imageData = selectedFrame.imageData;
 			options.postersData = selectedFrame.postersData;
 			options.usedFonts = selectedFrame.usedFonts;
-			options.shadowRootContents = selectedFrame.shadowRootContents;
+			options.shadowRootsData = selectedFrame.shadowRootsData;
 		} else {
 			options.doc = document;
 		}

+ 2 - 2
lib/frame-tree/content/content-frame-tree.js

@@ -132,7 +132,7 @@ this.frameTree = this.frameTree || (() => {
 					frameData.canvasData = messageFrameData.canvasData;
 					frameData.fontsData = messageFrameData.fontsData;
 					frameData.usedFonts = messageFrameData.usedFonts;
-					frameData.shadowRootContents = messageFrameData.shadowRootContents;
+					frameData.shadowRootsData = messageFrameData.shadowRootsData;
 					frameData.processed = messageFrameData.processed;
 				}
 			});
@@ -268,7 +268,7 @@ this.frameTree = this.frameTree || (() => {
 			canvasData: docData.canvasData,
 			fontsData: docData.fontsData,
 			usedFonts: docData.usedFonts,
-			shadowRootContents: docData.shadowRootContents,
+			shadowRootsData: docData.shadowRootsData,
 			processed: true
 		};
 	}

+ 10 - 10
lib/single-file/single-file-core.js

@@ -156,7 +156,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 				this.options.imageData = docData.imageData;
 				this.options.postersData = docData.postersData;
 				this.options.usedFonts = docData.usedFonts;
-				this.options.shadowRootContents = docData.shadowRootContents;
+				this.options.shadowRootsData = docData.shadowRootsData;
 				this.options.referrer = docData.referrer;
 			}
 			if (this.options.saveRawPage) {
@@ -350,8 +350,8 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 			if (!this.options.saveRawPage && !this.options.removeFrames && this.options.framesData) {
 				this.options.framesData.forEach(frameData => this.maxResources += frameData.maxResources || 0);
 			}
-			if (this.options.shadowRootContents) {
-				this.options.shadowRootContents.forEach(shadowRootData => this.maxResources += shadowRootData.maxResources || 0);
+			if (this.options.shadowRootsData) {
+				this.options.shadowRootsData.forEach(shadowRootData => this.maxResources += shadowRootData.maxResources || 0);
 			}
 			this.stats.set("processed", "resources", this.maxResources);
 		}
@@ -867,7 +867,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 					options.fontsData = frameData.fontsData;
 					options.imageData = frameData.imageData;
 					options.usedFonts = frameData.usedFonts;
-					options.shadowRootContents = frameData.shadowRootContents;
+					options.shadowRootsData = frameData.shadowRootsData;
 					frameData.processor = new Runner(options);
 					frameData.frameElement = frameElement;
 					await frameData.processor.loadPage();
@@ -880,7 +880,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 		async resolveShadowRootURLs() {
 			const rootOptions = this.options;
 			const batchRequest = this.batchRequest;
-			if (this.options.shadowRootContents) {
+			if (this.options.shadowRootsData) {
 				await resolveURLs(this.doc);
 			}
 
@@ -888,7 +888,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 				const shadowRootElements = Array.from((rootElement.querySelectorAll("[" + docUtil.SHADOW_ROOT_ATTRIBUTE_NAME + "]")));
 				await Promise.all(shadowRootElements.map(async element => {
 					const id = element.getAttribute(docUtil.SHADOW_ROOT_ATTRIBUTE_NAME);
-					const shadowRootData = rootOptions.shadowRootContents[Number(id)];
+					const shadowRootData = rootOptions.shadowRootsData[Number(id)];
 					const options = Object.create(rootOptions);
 					options.insertSingleFileComment = false;
 					options.insertFaviconLink = false;
@@ -906,7 +906,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 						options.fontsData = docData.fontsData;
 						options.imageData = docData.imageData;
 						options.usedFonts = docData.usedFonts;
-						options.shadowRootContents = docData.shadowRootContents;
+						options.shadowRootsData = docData.shadowRootsData;
 						shadowRootData.processor = new Runner(options);
 						shadowRootData.element = element;
 						await shadowRootData.processor.loadPage();
@@ -1069,7 +1069,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 			const rootDoc = this.doc;
 			const options = this.options;
 			const stats = this.stats;
-			if (this.options.shadowRootContents) {
+			if (this.options.shadowRootsData) {
 				await processRootElement(this.doc);
 				const scriptElement = rootDoc.createElement("script");
 				scriptElement.textContent = `processNode(document);function processNode(node){node.querySelectorAll("[${WC_ATTRIBUTE_NAME}]").forEach(element=>{const shadowRoot=element.previousElementSibling.attachShadow({mode:"open"});shadowRoot.innerHTML=element.innerHTML;element.remove();processNode(shadowRoot)})}`;
@@ -1081,9 +1081,9 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 				await Promise.all(shadowRootElements.map(async element => {
 					const id = element.getAttribute(docUtil.SHADOW_ROOT_ATTRIBUTE_NAME);
 					if (id) {
-						const shadowRootData = options.shadowRootContents[Number(id)];
+						const shadowRootData = options.shadowRootsData[Number(id)];
 						if (shadowRootData) {
-							options.shadowRootContents = options.shadowRootContents.filter(shadowRootInfo => shadowRootInfo.id != id);
+							options.shadowRootsData = options.shadowRootsData.filter(shadowRootData => shadowRootData.id != id);
 							if (shadowRootData.processor) {
 								stats.add("processed", "shadow root elements", 1);
 								await shadowRootData.processor.run();

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

@@ -73,7 +73,7 @@ this.docHelper = this.docHelper || (() => {
 		if (doc.head) {
 			doc.head.querySelectorAll("*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)").forEach(element => element.hidden = true);
 		}
-		let canvasData, imageData, usedFonts, shadowRootContents;
+		let canvasData, imageData, usedFonts, shadowRootsData;
 		if (win) {
 			canvasData = getCanvasData(doc, win);
 			imageData = getImageData(doc, win, options);
@@ -110,9 +110,9 @@ this.docHelper = this.docHelper || (() => {
 						}
 					});
 				}
-				shadowRootContents = getShadowRootContents(elementsInfo);
+				shadowRootsData = getshadowRootsData(elementsInfo);
 			} else if (doc.body) {
-				shadowRootContents = getShadowRootContents(getShadowRootElementsInfo(win, doc.body));
+				shadowRootsData = getshadowRootsData(getShadowRootElementsInfo(win, doc.body));
 			}
 		}
 		retrieveInputValues(doc);
@@ -123,24 +123,24 @@ this.docHelper = this.docHelper || (() => {
 			imageData,
 			postersData: getPostersData(doc),
 			usedFonts,
-			shadowRootContents,
+			shadowRootsData,
 			referrer: doc.referrer
 		};
 	}
 
-	function getShadowRootContents(elementsInfo) {
-		let shadowRootContents, elementIndex = 0;
+	function getshadowRootsData(elementsInfo) {
+		let shadowRootsData, elementIndex = 0;
 		elementsInfo.forEach((elementInfo, element) => {
 			if (element.attributes && elementInfo.shadowRoot) {
 				element.setAttribute(SHADOW_ROOT_ATTRIBUTE_NAME, elementIndex);
 				elementIndex++;
-				if (!shadowRootContents) {
-					shadowRootContents = [];
+				if (!shadowRootsData) {
+					shadowRootsData = [];
 				}
-				shadowRootContents.push({ content: element.shadowRoot.innerHTML, height: element.clientHeight });
+				shadowRootsData.push({ content: element.shadowRoot.innerHTML, height: element.clientHeight });
 			}
 		});
-		return shadowRootContents;
+		return shadowRootsData;
 	}
 
 	function getUsedFonts(styles, loadedFonts) {