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

Revision: 15445
          http://sourceforge.net/p/htmlunit/code/15445
Author:   rbri
Date:     2018-07-09 10:23:36 +0000 (Mon, 09 Jul 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/html/HTMLElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.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-07-09 10:11:23 UTC (rev 15444)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2018-07-09 10:23:36 UTC (rev 15445)
@@ -26,6 +26,7 @@
 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;
@@ -1447,7 +1448,7 @@
      * Returns the {@code onwheel} event handler for this element.
      * @return the {@code onwheel} event handler for this element
      */
-    @JsxGetter({CHROME, FF})
+    @JsxGetter(FF52)
     public Function getOnwheel() {
         return getEventHandler("wheel");
     }
@@ -1456,7 +1457,7 @@
      * Sets the {@code onwheel} event handler for this element.
      * @param onwheel the {@code onwheel} event handler for this element
      */
-    @JsxSetter({CHROME, FF})
+    @JsxSetter(FF52)
     public void setOnwheel(final Object onwheel) {
         setEventHandler("wheel", onwheel);
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-07-09 10:11:23 UTC (rev 15444)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-07-09 10:23:36 UTC (rev 15445)
@@ -24,6 +24,7 @@
 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.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.io.IOException;
@@ -2039,6 +2040,24 @@
     }
 
     /**
+     * Returns the {@code onwheel} event handler for this element.
+     * @return the {@code onwheel} event handler for this element
+     */
+    @JsxGetter({CHROME, FF60})
+    public Function getOnwheel() {
+        return super.getOnwheel();
+    }
+
+    /**
+     * Sets the {@code onwheel} event handler for this element.
+     * @param onwheel the {@code onwheel} event handler for this element
+     */
+    @JsxSetter({CHROME, FF60})
+    public void setOnwheel(final Object onwheel) {
+        super.setOnwheel(onwheel);
+    }
+
+    /**
      * Mock for the moment.
      * @param retargetToElement if true, all events are targeted directly to this element;
      * if false, events can also fire at descendants of this element

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-07-09 10:11:23 UTC (rev 15444)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-07-09 10:23:36 UTC (rev 15445)
@@ -18,6 +18,7 @@
 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.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -1642,4 +1643,21 @@
         setEventHandler("dragexit", dragexit);
     }
 
+    /**
+     * Returns the {@code onwheel} event handler for this element.
+     * @return the {@code onwheel} event handler for this element
+     */
+    @JsxGetter({CHROME, FF60})
+    public Function getOnwheel() {
+        return super.getOnwheel();
+    }
+
+    /**
+     * Sets the {@code onwheel} event handler for this element.
+     * @param onwheel the {@code onwheel} event handler for this element
+     */
+    @JsxSetter({CHROME, FF60})
+    public void setOnwheel(final Object onwheel) {
+        super.setOnwheel(onwheel);
+    }
 }


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot