Gildas vor 7 Jahren
Ursprung
Commit
0969c3da6a
1 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. 6 4
      lib/single-file/css-fonts-minifier.js

+ 6 - 4
lib/single-file/css-fonts-minifier.js

@@ -59,9 +59,8 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 			};
 			doc.querySelectorAll("style").forEach(style => {
 				if (style.sheet) {
-					const processedRules = style.sheet.cssRules.length;
-					stats.rules.processed += processedRules;
-					stats.rules.discarded += processedRules;
+					stats.rules.processed += style.sheet.cssRules.length;
+					stats.rules.discarded += style.sheet.cssRules.length;
 					processRules(doc, style.sheet.cssRules, fontsDetails, declaredFonts, usedFonts, secondPass);
 					style.textContent = processFontFaceRules(style.sheet.cssRules, fontsDetails, "all", stats);
 				}
@@ -82,7 +81,9 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 			}
 			doc.querySelectorAll("style").forEach(style => {
 				if (style.sheet) {
+					stats.fonts.discarded += style.sheet.cssRules.length;
 					style.textContent = deleteUnusedFonts(doc, style.sheet.cssRules, unusedFonts);
+					stats.fonts.discarded -= style.sheet.cssRules.length;
 					stats.rules.discarded -= style.sheet.cssRules.length;
 				}
 			});
@@ -183,6 +184,7 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 		const woff2FontFound = fontSources.find(fontSource => fontTest(fontSource, "woff2"));
 		const woffFontFound = fontSources.find(fontSource => fontTest(fontSource, "woff"));
 		stats.fonts.processed += fontSources.length;
+		stats.fonts.discarded += fontSources.length;
 		if (woffFontFound || woff2FontFound) {
 			fontSources = fontSources.filter(fontSource => woff2FontFound ? fontTest(fontSource, "woff2") : fontTest(fontSource, "woff"));
 		} else {
@@ -192,7 +194,7 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 				fontSources = fontSources.filter(fontSource => otfFontFound ? fontTest(fontSource, "otf") : fontTest(fontSource, "ttf"));
 			}
 		}
-		stats.fonts.processed += stats.fonts.processed - fontSources.length;
+		stats.fonts.discarded -= fontSources.length;
 		let cssText = "";
 		Array.from(rule.style).forEach(propertyName => {
 			cssText += propertyName + ":";