single-file-core 1.5.12 → 1.5.14

package/core/index.js

@@ -1535,7 +1535,7 @@ class Processor {
 			publisher: publisherElement && publisherElement.content ? publisherElement.content.trim() : "",
 			heading: headingElement && headingElement.textContent ? headingElement.textContent.trim() : ""
 		};
-		this.options.infobarContent = await util.evalTemplate(this.options.infobarTemplate, this.options, null, this.doc, true);
+		this.options.infobarContent = await util.evalTemplate(this.options.infobarTemplate, this.options, null, this.doc, { dontReplaceSlash: true });
 	}
 }
 

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/core/util.js

@@ -166,8 +166,8 @@ function getInstance(utilOptions) {
 		getMimeType(options) {
 			return !options.compressContent || options.selfExtractingArchive ? "text/html" : "application/zip";
 		},
-		async evalTemplate(template, options, content, doc, dontReplaceSlash) {
-			return modules.templateFormatter.evalTemplate(template, options, content, doc, dontReplaceSlash);
+		async evalTemplate(template, options, content, doc, context) {
+			return modules.templateFormatter.evalTemplate(template, options, content, doc, context);
 		},
 		minifyHTML(doc, options) {
 			return modules.htmlMinifier.process(doc, options);

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/template-formatter.js

@@ -16899,7 +16899,9 @@ async function formatFilename(content, doc, options) {
 	return filename.trim();
 }
 
-async function evalTemplate(template = "", options, content, doc, dontReplaceSlash) {
+async function evalTemplate(template = "", options, content, doc, context = {}) {
+	const { dontReplaceSlash } = context;
+	context.currentDate = new Date();
 	const url = new URL(options.saveUrl);
 	const urlHref = decode(url.href);
 	const params = Array.from(new URLSearchParams(url.search));
@@ -17018,11 +17020,11 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 		"decode-uri": value => { try { return decodeURI(value); } catch (error) { return value; } },
 		"encode-uri-component": value => { try { return encodeURIComponent(value); } catch (error) { return value; } },
 		"decode-uri-component": value => { try { return decodeURIComponent(value); } catch (error) { return value; } },
-		"date-locale": locales => new Date().toLocaleDateString(locales),
-		"time-locale": locales => new Date().toLocaleTimeString(locales),
-		"datetime-locale": locales => new Date().toLocaleString(locales),
+		"date-locale": locales => context.currentDate.toLocaleDateString(locales),
+		"time-locale": locales => context.currentDate.toLocaleTimeString(locales),
+		"datetime-locale": locales => context.currentDate.toLocaleString(locales),
 		"datetime-custom": (locale, year, month, day, weekday, hour, minute, second, hour12, timeZone, fractionalSecondDigits, timeZoneName, dayPeriod, era, localeMatcher) => {
-			const date = new Date();
+			const date = context.currentDate;
 			const options = {};
 			setOption(options, "year", year);
 			setOption(options, "month", month);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "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);
 			}