[HtmlUnit] SVN: [15338] trunk/htmlunit/src

[<rb...@us...>]

Revision: 15338
          http://sourceforge.net/p/htmlunit/code/15338
Author:   rbri
Date:     2018-06-16 20:04:04 +0000 (Sat, 16 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-16 20:04:04 UTC (rev 15338)
@@ -194,7 +194,7 @@
     EVENT_ONLOAD_INTERNAL_JAVASCRIPT,
 
     /** MessageEvent default data value is null. */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     EVENT_ONMESSAGE_DEFAULT_DATA_NULL,
 
     /** Does not trigger "onmousedown" event handler for the select options. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java	2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java	2018-06-16 20:04:04 UTC (rev 15338)
@@ -17,7 +17,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -109,7 +108,7 @@
      * Returns an {@link Iterator} allowing to go through all keys contained in this object.
      * @return an {@link Iterator}
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public Iterator keys() {
         final int length = getElements().size();
         final List<Integer> list = new ArrayList<>();
@@ -126,7 +125,7 @@
      * Returns an {@link Iterator} allowing to go through all keys contained in this object.
      * @return an {@link Iterator}
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public Iterator values() {
         final List<DomNode> list = getElements();
         final Iterator object = new Iterator(ITERATOR_NAME, list.iterator());
@@ -139,7 +138,7 @@
      * Returns an {@link Iterator} allowing to go through all key/value pairs contained in this object.
      * @return an {@link Iterator}
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public Iterator entries() {
         final List<DomNode> elements = getElements();
         final Context context = Context.getCurrentContext();
@@ -167,7 +166,7 @@
      * Calls the {@code callback} given in parameter once for each value pair in the list, in insertion order.
      * @param callback function to execute for each element
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public void forEach(final Object callback) {
         final List<DomNode> nodes = getElements();
         final Context context = Context.enter();

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java	2018-06-16 20:04:04 UTC (rev 15338)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.event;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -132,7 +132,7 @@
             FF = "exception",
             IE = {"-[object MessageEvent]", "-message", "-true", "-true", "-hello",
                             "-http://localhost:", "-undefined", "-[object Window]"})
-    @NotYetImplemented(FF52)
+    @NotYetImplemented(FF)
     public void initMessageEventPortsNull() throws Exception {
         final String[] expectedAlerts = getExpectedAlerts();
         if (expectedAlerts.length > 4) {