Răsfoiți Sursa

renamed imageData to imagesData

Gildas 6 ani în urmă
părinte
comite
54b21b4f51

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

@@ -92,7 +92,7 @@ singlefile.autosave = (() => {
 		options.canvasData = message.canvasData;
 		options.fontsData = message.fontsData;
 		options.stylesheetsData = message.stylesheetsData;
-		options.imageData = message.imageData;
+		options.imagesData = message.imagesData;
 		options.postersData = message.postersData;
 		options.usedFonts = message.usedFonts;
 		options.shadowRootsData = message.shadowRootsData;

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

@@ -72,7 +72,7 @@ this.singlefile.bootstrap = this.singlefile.bootstrap || (async () => {
 					canvasData: docData.canvasData,
 					fontsData: docData.fontsData,
 					stylesheetsData: docData.stylesheetsData,
-					imageData: docData.imageData,
+					imagesData: docData.imagesData,
 					postersData: docData.postersData,
 					usedFonts: docData.usedFonts,
 					shadowRootsData: docData.shadowRootsData,
@@ -114,7 +114,7 @@ this.singlefile.bootstrap = this.singlefile.bootstrap || (async () => {
 				canvasData: docData.canvasData,
 				fontsData: docData.fontsData,
 				stylesheetsData: docData.stylesheetsData,
-				imageData: docData.imageData,
+				imagesData: docData.imagesData,
 				postersData: docData.postersData,
 				usedFonts: docData.usedFonts,
 				shadowRootsData: docData.shadowRootsData,

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

@@ -132,7 +132,7 @@ this.singlefile.top = this.singlefile.top || (() => {
 			options.canvasData = selectedFrame.canvasData;
 			options.fontsData = selectedFrame.fontsData;
 			options.stylesheetsData = selectedFrame.stylesheetsData;
-			options.imageData = selectedFrame.imageData;
+			options.imagesData = selectedFrame.imagesData;
 			options.postersData = selectedFrame.postersData;
 			options.usedFonts = selectedFrame.usedFonts;
 			options.shadowRootsData = selectedFrame.shadowRootsData;

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

@@ -127,7 +127,7 @@ this.frameTree = this.frameTree || (() => {
 					frameData.baseURI = messageFrameData.baseURI;
 					frameData.title = messageFrameData.title;
 					frameData.stylesheetsData = messageFrameData.stylesheetsData;
-					frameData.imageData = messageFrameData.imageData;
+					frameData.imagesData = messageFrameData.imagesData;
 					frameData.postersData = messageFrameData.postersData;
 					frameData.canvasData = messageFrameData.canvasData;
 					frameData.fontsData = messageFrameData.fontsData;
@@ -263,7 +263,7 @@ this.frameTree = this.frameTree || (() => {
 			baseURI,
 			title: document.title,
 			stylesheetsData: docData.stylesheetsData,
-			imageData: docData.imageData,
+			imagesData: docData.imagesData,
 			postersData: docData.postersData,
 			canvasData: docData.canvasData,
 			fontsData: docData.fontsData,

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

@@ -152,7 +152,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 				this.options.canvasData = docData.canvasData;
 				this.options.fontsData = docData.fontsData;
 				this.options.stylesheetsData = docData.stylesheetsData;
-				this.options.imageData = docData.imageData;
+				this.options.imagesData = docData.imagesData;
 				this.options.postersData = docData.postersData;
 				this.options.usedFonts = docData.usedFonts;
 				this.options.shadowRootsData = docData.shadowRootsData;
@@ -474,10 +474,10 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 			if (this.options.win) {
 				this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => element instanceof this.options.win.HTMLElement && this.doc.head.appendChild(element));
 			}
-			if (this.options.imageData && !this.options.saveRawPage) {
+			if (this.options.imagesData && !this.options.saveRawPage) {
 				const dataAttributeName = docUtil.IMAGE_ATTRIBUTE_NAME;
 				this.doc.querySelectorAll("img").forEach(imgElement => {
-					const imgData = this.options.imageData[Number(imgElement.getAttribute(dataAttributeName))];
+					const imgData = this.options.imagesData[Number(imgElement.getAttribute(dataAttributeName))];
 					if (this.options.removeHiddenElements && imgData.size && !imgData.size.pxWidth && !imgData.size.pxHeight) {
 						imgElement.setAttribute("src", EMPTY_IMAGE);
 					} else if (imgData.currentSrc) {
@@ -486,7 +486,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 				});
 				if (this.options.loadDeferredImages) {
 					this.doc.querySelectorAll("img[data-src]").forEach(imgElement => {
-						const imgData = this.options.imageData[Number(imgElement.getAttribute(dataAttributeName))];
+						const imgData = this.options.imagesData[Number(imgElement.getAttribute(dataAttributeName))];
 						if ((!imgElement.getAttribute("src") || imgElement.getAttribute("src") == EMPTY_IMAGE) && imgElement.getAttribute("data-src")) {
 							imgData.src = imgElement.dataset.src;
 							imgElement.setAttribute("src", imgElement.dataset.src);
@@ -867,7 +867,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 					options.canvasData = frameData.canvasData;
 					options.stylesheetsData = frameData.stylesheetsData;
 					options.fontsData = frameData.fontsData;
-					options.imageData = frameData.imageData;
+					options.imagesData = frameData.imagesData;
 					options.usedFonts = frameData.usedFonts;
 					options.shadowRootsData = frameData.shadowRootsData;
 					frameData.processor = new Runner(options);
@@ -1571,7 +1571,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
 		static replaceImageSource(imgElement, variableName, options) {
 			const dataAttributeName = docUtil.IMAGE_ATTRIBUTE_NAME;
 			if (imgElement.getAttribute(dataAttributeName) != null) {
-				const imgData = options.imageData[Number(imgElement.getAttribute(dataAttributeName))];
+				const imgData = options.imagesData[Number(imgElement.getAttribute(dataAttributeName))];
 				if (imgData.replaceable) {
 					imgElement.setAttribute("src", `${PREFIX_DATA_URI_IMAGE_SVG},<svg xmlns="http://www.w3.org/2000/svg" width="${imgData.size.pxWidth}" height="${imgData.size.pxHeight}"><rect fill-opacity="0"/></svg>`);
 					const backgroundStyle = {};

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

@@ -83,7 +83,7 @@ this.docHelper = this.docHelper || (() => {
 		} else {
 			elementsInfo = {
 				canvasData: [],
-				imageData: [],
+				imagesData: [],
 				postersData: [],
 				usedFonts: [],
 				shadowRootsData: []
@@ -94,7 +94,7 @@ this.docHelper = this.docHelper || (() => {
 			canvasData: elementsInfo.canvasData,
 			fontsData: getFontsData(doc),
 			stylesheetsData: getStylesheetsData(doc),
-			imageData: elementsInfo.imagesData,
+			imagesData: elementsInfo.imagesData,
 			postersData: elementsInfo.postersData,
 			usedFonts: Array.from(elementsInfo.usedFonts),
 			shadowRootsData: elementsInfo.shadowRootsData,