diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a1b086b01ee..a1f272fe41d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -7,7 +7,7 @@ - + test-javadoc removed from the website. diff --git a/src/main/java/org/htmlunit/css/StyleAttributes.java b/src/main/java/org/htmlunit/css/StyleAttributes.java index d77617a3a89..a14f54c0623 100644 --- a/src/main/java/org/htmlunit/css/StyleAttributes.java +++ b/src/main/java/org/htmlunit/css/StyleAttributes.java @@ -1299,7 +1299,7 @@ public enum Definition { FONT_VARIANT_NUMERIC_("font-variant-numeric", "font-variant-numeric", ffNormal()), /** The style property {@code fontVariantPosition}. */ - FONT_VARIANT_POSITION("fontVariantPosition", "font-variant-position", ffNormal(), chrome("normal")), + FONT_VARIANT_POSITION("fontVariantPosition", "font-variant-position", ffNormal(), chromeAndEdgeNormal()), /** The style property {@code font-variant-position}. */ FONT_VARIANT_POSITION_("font-variant-position", "font-variant-position", ffNormal()), @@ -1490,7 +1490,7 @@ public enum Definition { INITIAL_VALUE("initialValue", "initial-value", chromeAndEdgeEmpty()), /** The style property {@code inlineSize}. */ - INLINE_SIZE("inlineSize", "inline-size", ff("1244px"), chrome("1240px"), edge("1185px")), + INLINE_SIZE("inlineSize", "inline-size", ff("1244px"), chrome("1240px"), edge("1192px")), /** The style property {@code inline-size}. */ INLINE_SIZE_("inline-size", "inline-size", ff("1244px")), @@ -2701,7 +2701,7 @@ public enum Definition { OVERFLOW_Y_("overflow-y", "overflow-y", ff("visible")), /** The style property {@code overlay}. */ - OVERLAY("overlay", "overlay", chrome("none")), + OVERLAY("overlay", "overlay", chromeAndEdgeNone()), /** The style property {@code overrideColors}. */ OVERRIDE_COLOR("overrideColors", "override-colors", chromeAndEdgeEmpty()), @@ -2850,7 +2850,7 @@ public enum Definition { /** The style property {@code perspectiveOrigin}. */ PERSPECTIVE_ORIGIN("perspectiveOrigin", "perspective-origin", - ff("622px 172.5px"), ie("745.605px 163.2px"), chrome("620px 162px"), edge("592.5px 162px")), + ff("622px 172.5px"), ie("745.605px 163.2px"), chrome("620px 162px"), edge("596px 162px")), /** The style property {@code perspective-origin}. */ PERSPECTIVE_ORIGIN_("perspective-origin", "perspective-origin", ff("622px 172.5px")), @@ -3548,7 +3548,7 @@ public enum Definition { /** The style property {@code transformOrigin}. */ TRANSFORM_ORIGIN("transformOrigin", "transform-origin", - ff("622px 172.5px"), ie("745.605px 163.2px"), chrome("620px 162px"), edge("592.5px 162px")), + ff("622px 172.5px"), ie("745.605px 163.2px"), chrome("620px 162px"), edge("596px 162px")), /** The style property {@code transform-origin}. */ TRANSFORM_ORIGIN_("transform-origin", "transform-origin", ff("622px 172.5px")), @@ -3564,7 +3564,7 @@ public enum Definition { ff("all 0s ease 0s")), /** The style property {@code transitionBehavior}. */ - TRANSITION_BEHAVIOR("transitionBehavior", "transition-behavior", chrome("normal")), + TRANSITION_BEHAVIOR("transitionBehavior", "transition-behavior", chromeAndEdgeNormal()), /** The style property {@code transitionDelay}. */ TRANSITION_DELAY("transitionDelay", "transition-delay", ff("0s"), ie("0s"), chromeAndEdge("0s")), @@ -3633,7 +3633,7 @@ public enum Definition { VIEW_TIMELINE_AXIS("viewTimelineAxis", "view-timeline-axis", chromeAndEdge("block")), /** The style property {@code viewTimelineInset}. */ - VIEW_TIMELINE_INSET("viewTimelineInset", "view-timeline-inset", chrome("auto"), edge("0px")), + VIEW_TIMELINE_INSET("viewTimelineInset", "view-timeline-inset", chromeAndEdgeAuto()), /** The style property {@code viewTimelineName}. */ VIEW_TIMELINE_NAME("viewTimelineName", "view-timeline-name", chromeAndEdgeNone()), @@ -4163,9 +4163,6 @@ public enum Definition { /** The style property {@code webkitFontSmoothing}. */ WEBKIT_FONT_SMOOTHING("webkitFontSmoothing", "webkit-font-smoothing", chromeAndEdgeAuto()), - /** The style property {@code webkitHighlight}. */ - WEBKIT_HIGHLIGHT("webkitHighlight", "webkit-highlight", edge("none")), - /** The style property {@code webkitHyphenateCharacter}. */ WEBKIT_HYPHENATE_CHARACTER("webkitHyphenateCharacter", "webkit-hyphenate-character", chromeAndEdgeAuto()), @@ -4197,7 +4194,7 @@ public enum Definition { WEBKIT_LOGICAL_HEIGHT("webkitLogicalHeight", "webkit-logical-height", chromeAndEdge("324px")), /** The style property {@code webkitLogicalWidth}. */ - WEBKIT_LOGICAL_WIDTH("webkitLogicalWidth", "webkit-logical-width", chrome("1240px"), edge("1185px")), + WEBKIT_LOGICAL_WIDTH("webkitLogicalWidth", "webkit-logical-width", chrome("1240px"), edge("1192px")), /** The style property {@code webkitMarginAfter}. */ WEBKIT_MARGIN_AFTER("webkitMarginAfter", "webkit-margin-after", chromeAndEdge("0px")), @@ -4373,7 +4370,7 @@ public enum Definition { /** The style property {@code webkitPerspectiveOrigin}. */ WEBKIT_PERSPECTIVE_ORIGIN("webkitPerspectiveOrigin", "webkit-perspective-origin", - ff("622px 172.5px"), chrome("620px 162px"), edge("592.5px 162px")), + ff("622px 172.5px"), chrome("620px 162px"), edge("596px 162px")), /** The style property {@code WebkitPerspectiveOrigin}. */ WEBKIT_PERSPECTIVE_ORIGIN_("WebkitPerspectiveOrigin", "webkit-perspective-origin", @@ -4507,7 +4504,7 @@ public enum Definition { /** The style property {@code webkitTransformOrigin}. */ WEBKIT_TRANSFORM_ORIGIN("webkitTransformOrigin", "webkit-transform-origin", - ff("622px 172.5px"), chrome("620px 162px"), edge("592.5px 162px")), + ff("622px 172.5px"), chrome("620px 162px"), edge("596px 162px")), /** The style property {@code WebkitTransformOrigin}. */ WEBKIT_TRANSFORM_ORIGIN_("WebkitTransformOrigin", "webkit-transform-origin", diff --git a/src/main/java/org/htmlunit/javascript/host/intl/DateTimeFormat.java b/src/main/java/org/htmlunit/javascript/host/intl/DateTimeFormat.java index c6e61ea5b8c..d21f935779b 100644 --- a/src/main/java/org/htmlunit/javascript/host/intl/DateTimeFormat.java +++ b/src/main/java/org/htmlunit/javascript/host/intl/DateTimeFormat.java @@ -143,18 +143,19 @@ public class DateTimeFormat extends HtmlUnitScriptable { commonFormats.put("zh-SG", "\u200EYYYY\u200E\u5E74\u200EMM\u200E\u6708\u200Edd\u200E\u65E5"); commonFormats.put("fr-CH", ddDot); - CHROME_FORMATS_.putAll(commonFormats); - EDGE_FORMATS_.putAll(commonFormats); - IE_FORMATS_.putAll(commonFormats); FF_FORMATS_.putAll(commonFormats); FF_ESR_FORMATS_.putAll(commonFormats); - CHROME_FORMATS_.put("be", mmSlash); - CHROME_FORMATS_.put("ga", mmSlash); - CHROME_FORMATS_.put("is", mmSlash); - CHROME_FORMATS_.put("mk", mmSlash); + commonFormats.put("be", mmSlash); + commonFormats.put("ga", mmSlash); + commonFormats.put("is", mmSlash); + commonFormats.put("mk", mmSlash); + + EDGE_FORMATS_.putAll(commonFormats); + + CHROME_FORMATS_.putAll(commonFormats); CHROME_FORMATS_.put("sq", mmSlash); FF_ESR_FORMATS_.put("sr", ddDotDot); diff --git a/src/test/java/org/htmlunit/BrowserVersionTest.java b/src/test/java/org/htmlunit/BrowserVersionTest.java index 6f11ab12eee..4ec074e3e18 100644 --- a/src/test/java/org/htmlunit/BrowserVersionTest.java +++ b/src/test/java/org/htmlunit/BrowserVersionTest.java @@ -38,7 +38,7 @@ public void getBrowserVersionNumeric() { assertEquals(116, BrowserVersion.FIREFOX.getBrowserVersionNumeric()); assertEquals(102, BrowserVersion.FIREFOX_ESR.getBrowserVersionNumeric()); assertEquals(118, BrowserVersion.CHROME.getBrowserVersionNumeric()); - assertEquals(116, BrowserVersion.EDGE.getBrowserVersionNumeric()); + assertEquals(118, BrowserVersion.EDGE.getBrowserVersionNumeric()); assertEquals(11, BrowserVersion.INTERNET_EXPLORER.getBrowserVersionNumeric()); } diff --git a/src/test/java/org/htmlunit/general/HostTypeOfTest.java b/src/test/java/org/htmlunit/general/HostTypeOfTest.java index 2d19b634dc9..17857a98d3c 100644 --- a/src/test/java/org/htmlunit/general/HostTypeOfTest.java +++ b/src/test/java/org/htmlunit/general/HostTypeOfTest.java @@ -4543,6 +4543,8 @@ public void isNaN() throws Exception { @Alerts(DEFAULT = "undefined", CHROME = "function", EDGE = "function") + @HtmlUnitNYI(CHROME = "undefined", + EDGE = "undefined") public void iterator() throws Exception { test("Iterator"); }