Merge remote-tracking branch 'torusrxxx/torusrxxx-patch-1' into next

hyphanet · Jan 10, 2025 · 06530eb · 06530eb
2 parents a921c7d + 1e9483f
commit 06530eb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/freenet/client/filter/CSSTokenizerFilter.java b/src/freenet/client/filter/CSSTokenizerFilter.java
@@ -358,8 +358,7 @@ public static <T> T[] concat(T[] a, T[] b) {
 		allelementVerifiers.add("word-wrap");
 		allelementVerifiers.add("writing-mode");
 		allelementVerifiers.add("z-index");
-
-
+		allelementVerifiers.add("zoom");
 	}
 
 	/*
@@ -429,7 +428,7 @@ public static <T> T[] concat(T[] a, T[] b) {
 		auxilaryVerifiers[115] = new CSSPropertyVerifier(Arrays.asList("none"),null,null,Arrays.asList("100a101a102"));
 		auxilaryVerifiers[116] = new CSSPropertyVerifier(Arrays.asList("blink"), null, null, null, true);
 		// <text-decoration-style>
-		auxilaryVerifiers[104] = new CSSPropertyVerifier(Arrays.asList("solid", "double", "dotted", "dashed", "wave"), null, null, null, true);
+		auxilaryVerifiers[104] = new CSSPropertyVerifier(Arrays.asList("solid", "double", "dotted", "dashed", "wavy"), null, null, null, true);
 
 		// <text-emphasis-style>
 		auxilaryVerifiers[105]=new CSSPropertyVerifier(Arrays.asList("filled","open"),null,null,null,true);
@@ -1820,6 +1819,11 @@ else if("z-index".equalsIgnoreCase(element))
 			elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("in")));
 			allelementVerifiers.remove(element);
 		}
+		else if("zoom".equalsIgnoreCase(element))
+		{
+			elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("normal"),ElementInfo.VISUALMEDIA,Arrays.asList("re","pe")));
+			allelementVerifiers.remove(element);
+		}
 		else if("transition-delay".equalsIgnoreCase(element))
 		{
 			elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("145<1,65535>"),false,true));