Skip to content

Commit

Permalink
edge 118
Browse files Browse the repository at this point in the history
  • Loading branch information
rbri committed Oct 15, 2023
1 parent 616f7af commit 8d5acab
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</properties>

<body>
<release version="3.7.0" date="October xx, 2023" description="Firefox 118, Chrome 118, Bugfixes, Documentation updates">
<release version="3.7.0" date="October xx, 2023" description="Firefox 118, Chrome/Edge 118, Bugfixes, Documentation updates">
<action type="remove" dev="rbri">
test-javadoc removed from the website.
</action>
Expand Down
23 changes: 10 additions & 13 deletions src/main/java/org/htmlunit/css/StyleAttributes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down Expand Up @@ -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")),
Expand Down Expand Up @@ -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()),
Expand Down Expand Up @@ -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")),
Expand Down Expand Up @@ -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")),
Expand All @@ -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")),
Expand Down Expand Up @@ -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()),
Expand Down Expand Up @@ -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()),

Expand Down Expand Up @@ -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")),
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/htmlunit/BrowserVersionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/htmlunit/general/HostTypeOfTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

0 comments on commit 8d5acab

Please sign in to comment.