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

replace includeScript with getScript

Gildas 3 лет назад
Родитель
Сommit
b7b97790b5

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

@@ -156,7 +156,7 @@ async function saveContent(message, tab) {
 			} else {
 				pageData = await getPageData(options, null, null, { fetch });
 				if (options.includeInfobar) {
-					await infobar.includeScript(pageData);
+					pageData.content += await infobar.getScript();
 				}
 				if (options.saveToGDrive) {
 					const blob = new Blob([pageData.content], { type: "text/html" });

+ 3 - 3
src/extension/core/common/download.js

@@ -30,12 +30,12 @@ export {
 };
 
 async function downloadPage(pageData, options) {
-	if (options.includeInfobar) {
-		await infobar.includeScript(pageData);
-	}
 	if (options.includeBOM) {
 		pageData.content = "\ufeff" + pageData.content;
 	}
+	if (options.includeInfobar) {
+		pageData.content += await infobar.getScript();
+	}
 	if (options.backgroundSave || options.openEditor || options.saveToGDrive || options.saveToGitHub || options.saveWithCompanion) {
 		for (let blockIndex = 0; blockIndex * MAX_CONTENT_SIZE < pageData.content.length; blockIndex++) {
 			const message = {

+ 3 - 3
src/extension/core/content/content-infobar.js

@@ -28,12 +28,12 @@ const SCRIPT_PATH = "/lib/single-file-infobar.js";
 const browser = globalThis.browser;
 
 export {
-	includeScript
+	getScript
 };
 
-async function includeScript(pageData) {
+async function getScript() {
 	if (browser && browser.runtime && browser.runtime.getURL) {
 		const infobarContent = await (await fetch(browser.runtime.getURL(SCRIPT_PATH))).text();
-		pageData.content += "<script>document.currentScript.remove();" + infobarContent + "</script>";
+		return "<script>document.currentScript.remove();" + infobarContent + "</script>";
 	}
 }