single-file-core 1.5.11 → 1.5.13

package/core/infobar.js

@@ -75,11 +75,11 @@ const INFOBAR_STYLES = `
   animation-iteration-count: 2;
 }
 
-.infobar:valid, .infobar:not(:focus-within) .infobar-content {
+.infobar:valid, .infobar:not(:focus-within):not(.infobar-focus) .infobar-content {
   display: none;
 }
 
-.infobar:focus-within {
+.infobar:focus-within, .infobar.infobar-focus {
   background-color: #f9f9f9;
   border-color: #878787;
   border-radius: 8px;
@@ -135,9 +135,10 @@ const INFOBAR_STYLES = `
   }
 }
 
-.infobar:focus-within .infobar-icon {
+.infobar:focus-within .infobar-icon, .infobar.infobar-focus .infobar-icon {
   z-index: -1;
   background-image: none;
+  margin: 4px;
 }
 
 .infobar .infobar-close-icon {
@@ -196,6 +197,9 @@ function appendInfobar(doc, options, useShadowRoot) {
 		shadowRootContent.appendChild(styleElement);
 		const infobarContent = doc.createElement("form");
 		infobarContent.classList.add("infobar");
+		if (options.openInfobar) {
+			infobarContent.classList.add("infobar-focus");
+		}
 		shadowRootContent.appendChild(infobarContent);
 		const iconElement = doc.createElement("span");
 		iconElement.tabIndex = -1;
@@ -276,9 +280,10 @@ function refreshInfobarInfo(doc, { saveUrl, infobarContent, saveDate }) {
 	}
 }
 
-function displayIcon(doc, useShadowRoot) {
+function displayIcon(doc, useShadowRoot, options = {}) {
 	const infoData = extractInfobarData(doc);
 	if (infoData.saveUrl) {
+		infoData.openInfobar = options.openInfobar;
 		appendInfobar(doc, infoData, useShadowRoot);
 		refreshInfobarInfo(doc, infoData);
 	}

package/modules/css-medias-alt-minifier.js

@@ -72,7 +72,7 @@ function matchesMediaType(mediaText) {
 	const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node)));
 	return foundMediaTypes.find(mediaTypeInfo =>
 		(!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL)) ||
-		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN && mediaTypeInfo.value != MEDIA_ALL)));
+		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN)));
 }
 
 function getMediaTypes(parentNode, mediaTypes = []) {

package/modules/html-serializer.js

@@ -94,7 +94,7 @@ function serializeTextNode(textNode) {
 		parentTagName = getTagName(parentNode);
 	}
 	if (!parentTagName || TEXT_NODE_TAGS.includes(parentTagName)) {
-		if (parentTagName == "SCRIPT" || parentTagName == "STYLE") {
+		if ((parentTagName == "SCRIPT" && (!parentNode.type || parentNode.type == "text/javascript")) || parentTagName == "STYLE") {
 			return textNode.textContent.replace(/<\//gi, "<\\/").replace(/\/>/gi, "\\/>");
 		}
 		return textNode.textContent;
@@ -180,5 +180,5 @@ function startsWithSpaceChar(textContent) {
 }
 
 function getTagName(element) {
-	return  element.tagName && element.tagName.toUpperCase();
+	return element.tagName && element.tagName.toUpperCase();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.5.11",
+  "version": "1.5.13",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/single-file-editor-helper.js

@@ -43,8 +43,8 @@ const helper = {
 	extractInfobarData(doc) {
 		return infobar.extractInfobarData(doc);
 	},
-	displayIcon(doc, useShadowRoot) {
-		return infobar.displayIcon(doc, useShadowRoot);
+	displayIcon(doc, useShadowRoot, options = {}) {
+		return infobar.displayIcon(doc, useShadowRoot, options);
 	},
 	zip,
 	extract,

package/single-file-infobar.js

@@ -60,6 +60,7 @@ import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./core/in
 				}
 			}
 			if (options.displayInfobar) {
+				infoData.openInfobar = options.openInfobar;
 				appendInfobar(document, infoData, true);
 				refreshInfobarInfo(document, infoData);
 			}