remove option "remove HTML imports" (obsolete)

gildas-lormeau · gildas-lormeau · commit 35366f30f758 · 2022-06-09T21:04:37.000+02:00
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -235,10 +235,6 @@
 		"message": "HTML-Inhalt komprimieren",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "Eingebundene HTML-Inhalte entfernen",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "Rahmen entfernen",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -235,10 +235,6 @@
 		"message": "compress HTML content",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "remove HTML imports",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "remove frames",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
@@ -235,10 +235,6 @@
 		"message": "comprimir contenido HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "eliminar importaciones de HTML (import)",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "eliminar marcos (frame)",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
@@ -235,10 +235,6 @@
 		"message": "compresser le contenu HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "supprimer les imports HTML",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "supprimer les cadres",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
@@ -235,10 +235,6 @@
 		"message": "comprimi contenuto HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "rimuovi importazioni HTML",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "rimuovi frame",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
@@ -235,10 +235,6 @@
 		"message": "HTML コンテンツを圧縮する",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "取り込んだ HTML を削除する",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "フレームを削除する",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
@@ -235,10 +235,6 @@
 		"message": "kompresuj zawartość HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "usuwaj importy HTML",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "usuwaj ramki",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/pt_br/messages.json b/_locales/pt_br/messages.json
@@ -235,10 +235,6 @@
 		"message": "compactar conteúdo HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "remover importações de HTML",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "remover frames",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -235,10 +235,6 @@
 		"message": "сжать содержимое HTML",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "удалить импорт HTML",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "удалить фреймы",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json
@@ -235,10 +235,6 @@
 		"message": "стискати вміст HTML ",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "видалити HTML-імпорт ",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "видалити фрейми",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -235,10 +235,6 @@
 		"message": "压缩 HTML 内容",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "移除 HTML 导入",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "移除框架",
 		"description": "Options page label: 'remove frames'"
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
@@ -235,10 +235,6 @@
 		"message": "壓縮 HTML 內容",
 		"description": "Options page label: 'compress HTML content'"
 	},
-	"optionRemoveImports": {
-		"message": "移除 HTML 導入",
-		"description": "Options page label: 'remove HTML imports'"
-	},
 	"optionRemoveFrames": {
 		"message": "移除框架",
 		"description": "Options page label: 'remove frames'"
diff --git a/src/core/bg/autosave.js b/src/core/bg/autosave.js
@@ -138,7 +138,6 @@ async function saveContent(message, tab) {
 		options.videos = message.videos;
 		options.usedFonts = message.usedFonts;
 		options.shadowRoots = message.shadowRoots;
-		options.imports = message.imports;
 		options.referrer = message.referrer;
 		options.updatedResources = message.updatedResources;
 		options.visitDate = new Date(message.visitDate);
diff --git a/src/core/bg/config.js b/src/core/bg/config.js
@@ -37,7 +37,6 @@ const DEFAULT_CONFIG = {
 	removeUnusedStyles: true,
 	removeUnusedFonts: true,
 	removeFrames: false,
-	removeImports: true,
 	compressHTML: true,
 	compressCSS: false,
 	loadDeferredImages: true,
diff --git a/src/core/content/content-bootstrap.js b/src/core/content/content-bootstrap.js
@@ -288,7 +288,6 @@ function savePage(docData, frames, { autoSaveUnload, autoSaveDiscard, autoSaveRe
 		usedFonts: docData.usedFonts,
 		shadowRoots: docData.shadowRoots,
 		videos: docData.videos,
-		imports: docData.imports,
 		referrer: docData.referrer,
 		frames: frames,
 		url: location.href,
diff --git a/src/core/content/content.js b/src/core/content/content.js
@@ -223,7 +223,6 @@ async function processPage(options) {
 		options.videos = selectedFrame.videos;
 		options.usedFonts = selectedFrame.usedFonts;
 		options.shadowRoots = selectedFrame.shadowRoots;
-		options.imports = selectedFrame.imports;
 	} else {
 		options.doc = document;
 	}
diff --git a/src/ui/bg/ui-options.js b/src/ui/bg/ui-options.js
@@ -31,7 +31,6 @@ const removeHiddenElementsLabel = document.getElementById("removeHiddenElementsL
 const removeUnusedStylesLabel = document.getElementById("removeUnusedStylesLabel");
 const removeUnusedFontsLabel = document.getElementById("removeUnusedFontsLabel");
 const removeFramesLabel = document.getElementById("removeFramesLabel");
-const removeImportsLabel = document.getElementById("removeImportsLabel");
 const blockScriptsLabel = document.getElementById("blockScriptsLabel");
 const blockAudiosLabel = document.getElementById("blockAudiosLabel");
 const blockVideosLabel = document.getElementById("blockVideosLabel");
@@ -147,7 +146,6 @@ const removeHiddenElementsInput = document.getElementById("removeHiddenElementsI
 const removeUnusedStylesInput = document.getElementById("removeUnusedStylesInput");
 const removeUnusedFontsInput = document.getElementById("removeUnusedFontsInput");
 const removeFramesInput = document.getElementById("removeFramesInput");
-const removeImportsInput = document.getElementById("removeImportsInput");
 const blockScriptsInput = document.getElementById("blockScriptsInput");
 const blockVideosInput = document.getElementById("blockVideosInput");
 const blockAudiosInput = document.getElementById("blockAudiosInput");
@@ -487,7 +485,6 @@ removeHiddenElementsLabel.textContent = browser.i18n.getMessage("optionRemoveHid
 removeUnusedStylesLabel.textContent = browser.i18n.getMessage("optionRemoveUnusedStyles");
 removeUnusedFontsLabel.textContent = browser.i18n.getMessage("optionRemoveUnusedFonts");
 removeFramesLabel.textContent = browser.i18n.getMessage("optionRemoveFrames");
-removeImportsLabel.textContent = browser.i18n.getMessage("optionRemoveImports");
 blockScriptsLabel.textContent = browser.i18n.getMessage("optionResourceScript");
 blockAudiosLabel.textContent = browser.i18n.getMessage("optionResourceAudio");
 blockVideosLabel.textContent = browser.i18n.getMessage("optionResourceVideo");
@@ -715,7 +712,6 @@ async function refresh(profileName) {
 	removeUnusedStylesInput.checked = profileOptions.removeUnusedStyles;
 	removeUnusedFontsInput.checked = profileOptions.removeUnusedFonts;
 	removeFramesInput.checked = profileOptions.removeFrames;
-	removeImportsInput.checked = profileOptions.removeImports;
 	blockScriptsInput.checked = profileOptions.blockScripts;
 	blockVideosInput.checked = profileOptions.blockVideos;
 	blockAudiosInput.checked = profileOptions.blockAudios;
@@ -825,7 +821,6 @@ async function update() {
 			removeUnusedStyles: removeUnusedStylesInput.checked,
 			removeUnusedFonts: removeUnusedFontsInput.checked,
 			removeFrames: removeFramesInput.checked,
-			removeImports: removeImportsInput.checked,
 			blockScripts: blockScriptsInput.checked,
 			blockVideos: blockVideosInput.checked,
 			blockAudios: blockAudiosInput.checked,
diff --git a/src/ui/pages/help.html b/src/ui/pages/help.html
@@ -193,11 +193,6 @@ <h4>Save a complete page into a single self-extracting HTML/ZIP file</h4>
 							altering the document.</p>
 						<p class="notice">It is recommended to <u>check</u> this option</p>
 					</li>
-					<li data-options-label="removeImportsLabel"> <span class="option">Option: remove HTML imports</span>
-						<p>Check this option to remove all link elements used to import HTML documents. Checking this
-							option can help to reduce the size of the file without altering the document.</p>
-						<p class="notice">It is recommended to <u>check</u> this option</p>
-					</li>
 					<li data-options-label="removeHiddenElementsLabel"> <span class="option">Option: remove hidden
 							elements</span>
 						<p>Check this option to remove all hidden elements. Checking this option can help to reduce the
diff --git a/src/ui/pages/options.html b/src/ui/pages/options.html
@@ -89,10 +89,6 @@ <h3>
 				<label for="compressHTMLInput" id="compressHTMLLabel"></label>
 				<input type="checkbox" id="compressHTMLInput">
 			</div>
-			<div class="option">
-				<label for="removeImportsInput" id="removeImportsLabel"></label>
-				<input type="checkbox" id="removeImportsInput">
-			</div>
 			<div class="option">
 				<label for="removeHiddenElementsInput" id="removeHiddenElementsLabel"></label>
 				<input type="checkbox" id="removeHiddenElementsInput">
