Chrome/Edge 141, Firefox 143, FirefoxESR 140

Author: rbri

src/main/java/org/htmlunit/BrowserVersionFeatures.java

@@ -74,10 +74,6 @@ public enum BrowserVersionFeatures {
     @BrowserFeature({FF, FF_ESR})
     EVENT_ONANIMATION_DOCUMENT_CREATE_NOT_SUPPORTED,
 
-    /** Triggers 'onclick' event handler using <code>PointerEvent</code>. */
-    @BrowserFeature({CHROME, EDGE, FF})
-    EVENT_ONCLICK_USES_POINTEREVENT,
-
     /** <code>CloseEvent</code> can not be created by calling document.createEvent('CloseEvent'). */
     @BrowserFeature({FF, FF_ESR})
     EVENT_ONCLOSE_DOCUMENT_CREATE_NOT_SUPPORTED,

src/main/java/org/htmlunit/html/DomElement.java

@@ -15,7 +15,6 @@
 package org.htmlunit.html;
 
 import static org.htmlunit.BrowserVersionFeatures.EVENT_CONTEXT_MENU_HAS_DETAIL_1;
-import static org.htmlunit.BrowserVersionFeatures.EVENT_ONCLICK_USES_POINTEREVENT;
 import static org.htmlunit.BrowserVersionFeatures.JS_AREA_WITHOUT_HREF_FOCUSABLE;
 
 import java.io.IOException;
@@ -1086,14 +1085,8 @@ else if (this instanceof HtmlOption) {
                 MouseEvent event = null;
                 if (webClient.isJavaScriptEnabled()) {
                     final BrowserVersion browser = webClient.getBrowserVersion();
-                    if (browser.hasFeature(EVENT_ONCLICK_USES_POINTEREVENT)) {
-                        event = new PointerEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
-                                ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
-                    }
-                    else {
-                        event = new MouseEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
-                                ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
-                    }
+                    event = new PointerEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
+                            ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
 
                     if (disableProcessLabelAfterBubbling) {
                         event.disableProcessLabelAfterBubbling();
@@ -1489,16 +1482,11 @@ private Page doMouseEvent(final String eventType, final boolean shiftKey, final
         final Event event;
         if (MouseEvent.TYPE_CONTEXT_MENU.equals(eventType)) {
             final BrowserVersion browserVersion = webClient.getBrowserVersion();
-            if (browserVersion.hasFeature(EVENT_ONCLICK_USES_POINTEREVENT)) {
-                if (browserVersion.hasFeature(EVENT_CONTEXT_MENU_HAS_DETAIL_1)) {
-                    event = new PointerEvent(this, eventType, shiftKey, ctrlKey, altKey, button, 1);
-                }
-                else {
-                    event = new PointerEvent(this, eventType, shiftKey, ctrlKey, altKey, button, 0);
-                }
+            if (browserVersion.hasFeature(EVENT_CONTEXT_MENU_HAS_DETAIL_1)) {
+                event = new PointerEvent(this, eventType, shiftKey, ctrlKey, altKey, button, 1);
             }
             else {
-                event = new MouseEvent(this, eventType, shiftKey, ctrlKey, altKey, button, 1);
+                event = new PointerEvent(this, eventType, shiftKey, ctrlKey, altKey, button, 0);
             }
         }
         else if (MouseEvent.TYPE_DBL_CLICK.equals(eventType)) {

src/test/java/org/htmlunit/general/DedicatedWorkerGlobalScopeTypeOfTest.java

@@ -6693,7 +6693,8 @@ public void selection() throws Exception {
     @Alerts(DEFAULT = "undefined",
             FF = "function",
             FF_ESR = "function")
-    @HtmlUnitNYI(FF = "undefined")
+    @HtmlUnitNYI(FF = "undefined",
+            FF_ESR = "undefined")
     public void serviceWorker() throws Exception {
         test("ServiceWorker");
     }
@@ -6705,7 +6706,8 @@ public void serviceWorker() throws Exception {
     @Alerts(DEFAULT = "undefined",
             FF = "function",
             FF_ESR = "function")
-    @HtmlUnitNYI(FF = "undefined")
+    @HtmlUnitNYI(FF = "undefined",
+            FF_ESR = "undefined")
     public void serviceWorkerContainer() throws Exception {
         test("ServiceWorkerContainer");
     }

src/test/java/org/htmlunit/general/HostClassNameTest.java

@@ -1178,7 +1178,8 @@ public void css2Properties() throws Exception {
     @Alerts(DEFAULT = "ReferenceError",
             FF = "function CSSPageDescriptors() { [native code] }",
             FF_ESR = "function CSSPageDescriptors() { [native code] }")
-    @HtmlUnitNYI(FF = "ReferenceError")
+    @HtmlUnitNYI(FF = "ReferenceError",
+            FF_ESR = "ReferenceError")
     public void cssPageDescriptors() throws Exception {
         test("CSSPageDescriptors");
     }

src/test/java/org/htmlunit/general/HostTypeOfTest.java

@@ -1158,7 +1158,8 @@ public void css2Properties() throws Exception {
     @Alerts(DEFAULT = "undefined",
             FF = "function",
             FF_ESR = "function")
-    @HtmlUnitNYI(FF = "undefined")
+    @HtmlUnitNYI(FF = "undefined",
+            FF_ESR = "undefined")
     public void cssPageDescriptors() throws Exception {
         test("CSSPageDescriptors");
     }