[HtmlUnit] SVN: [15401] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host

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

Revision: 15401
          http://sourceforge.net/p/htmlunit/code/15401
Author:   rbri
Date:     2018-06-29 06:14:33 +0000 (Fri, 29 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2018-06-29 06:03:15 UTC (rev 15400)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2018-06-29 06:14:33 UTC (rev 15401)
@@ -26,7 +26,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 static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.io.IOException;
@@ -1241,7 +1240,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter({CHROME, FF52, EDGE})
+    @JsxGetter({CHROME, FF, EDGE})
     public Object getPrefix() {
         return super.getPrefix();
     }
@@ -1250,7 +1249,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter({CHROME, FF52, EDGE})
+    @JsxGetter({CHROME, FF, EDGE})
     public Object getLocalName() {
         return super.getLocalName();
     }
@@ -1259,7 +1258,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter({CHROME, FF52, EDGE})
+    @JsxGetter({CHROME, FF, EDGE})
     public Object getNamespaceURI() {
         return super.getNamespaceURI();
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java	2018-06-29 06:03:15 UTC (rev 15400)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java	2018-06-29 06:14:33 UTC (rev 15401)
@@ -19,7 +19,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.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import org.apache.commons.lang3.StringUtils;
@@ -141,33 +140,6 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter(FF60)
-    public Object getPrefix() {
-        return super.getPrefix();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @JsxGetter(FF60)
-    public Object getLocalName() {
-        return super.getLocalName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @JsxGetter(FF60)
-    public Object getNamespaceURI() {
-        return super.getNamespaceURI();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     @JsxFunction({CHROME, FF, EDGE})
     public void remove() {
         super.remove();

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java	2018-06-29 06:03:15 UTC (rev 15400)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java	2018-06-29 06:14:33 UTC (rev 15401)
@@ -19,7 +19,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.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.util.ArrayList;
@@ -720,7 +719,7 @@
      * Returns the namespace prefix.
      * @return the namespace prefix
      */
-    @JsxGetter({FF60, IE})
+    @JsxGetter(IE)
     public Object getPrefix() {
         return getDomNodeOrDie().getPrefix();
     }
@@ -729,7 +728,7 @@
      * Returns the local name of this attribute.
      * @return the local name of this attribute
      */
-    @JsxGetter({FF60, IE})
+    @JsxGetter(IE)
     public Object getLocalName() {
         return getDomNodeOrDie().getLocalName();
     }
@@ -738,7 +737,7 @@
      * Returns the URI that identifies an XML namespace.
      * @return the URI that identifies an XML namespace
      */
-    @JsxGetter({FF60, IE})
+    @JsxGetter(IE)
     public Object getNamespaceURI() {
         return getDomNodeOrDie().getNamespaceURI();
     }