Menu
▾
▴
[HtmlUnit] SVN: [15320] trunk/htmlunit/src
|
From: <rb...@us...> - 2018-06-15 17:43:57
|
Revision: 15320
http://sourceforge.net/p/htmlunit/code/15320
Author: rbri
Date: 2018-06-15 17:43:45 +0000 (Fri, 15 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/html/HTMLAnchorElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -1323,7 +1323,7 @@
JS_TREEWALKER_FILTER_FUNCTION_ONLY,
/** Types arrays can be constructed with {@code null}. */
- @BrowserFeature(CHROME)
+ @BrowserFeature({CHROME, FF60})
JS_TYPED_ARRAYS_NULL,
/** Setting the property align to arbitrary values is allowed. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -212,7 +212,7 @@
* Returns the value of the rev property.
* @return the referrerPolicy property
*/
- @JsxGetter({CHROME, FF52})
+ @JsxGetter({CHROME, FF})
public String getReferrerPolicy() {
String attrib = ((HtmlAnchor) getDomNodeOrDie()).getAttribute("referrerPolicy");
if (StringUtils.isEmpty(attrib)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -18,6 +18,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.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.util.Locale;
@@ -511,7 +512,7 @@
* Returns the {@code onmessageerror} event handler for this element.
* @return the {@code onmessageerror} event handler for this element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public Function getOnmessageerror() {
return getEventHandler("onmessageerror");
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import com.gargoylesoftware.htmlunit.html.HtmlDetails;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,8 +26,9 @@
* The JavaScript object {@code HTMLDetailsElement}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass(domClass = HtmlDetails.class, value = {CHROME, FF52})
+@JsxClass(domClass = HtmlDetails.class, value = {CHROME, FF})
public class HTMLDetailsElement extends HTMLElement {
/**
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-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -23,8 +23,8 @@
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.FF60;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.io.IOException;
@@ -73,7 +73,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlEmphasis;
-import com.gargoylesoftware.htmlunit.html.HtmlExample;
import com.gargoylesoftware.htmlunit.html.HtmlFigure;
import com.gargoylesoftware.htmlunit.html.HtmlFigureCaption;
import com.gargoylesoftware.htmlunit.html.HtmlFooter;
@@ -81,7 +80,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlKeyboard;
import com.gargoylesoftware.htmlunit.html.HtmlLayer;
-import com.gargoylesoftware.htmlunit.html.HtmlListing;
import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlMark;
import com.gargoylesoftware.htmlunit.html.HtmlNav;
@@ -173,7 +171,6 @@
@JsxClass(domClass = HtmlDefinitionTerm.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlElement.class, value = {FF, IE})
@JsxClass(domClass = HtmlEmphasis.class, value = {CHROME, FF})
-@JsxClass(domClass = HtmlExample.class, value = FF60)
@JsxClass(domClass = HtmlFigure.class)
@JsxClass(domClass = HtmlFigureCaption.class)
@JsxClass(domClass = HtmlFooter.class)
@@ -181,7 +178,6 @@
@JsxClass(domClass = HtmlItalic.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlKeyboard.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlLayer.class, value = CHROME)
-@JsxClass(domClass = HtmlListing.class, value = FF60)
@JsxClass(domClass = HtmlMark.class)
@JsxClass(domClass = HtmlNav.class)
@JsxClass(domClass = HtmlNoBreak.class, value = {CHROME, FF})
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,6 +17,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.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.html.HtmlFrameSet;
@@ -208,7 +209,7 @@
* Returns the {@code onmessageerror} event handler for this element.
* @return the {@code onmessageerror} event handler for this element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public Function getOnmessageerror() {
return getEventHandler("onmessageerror");
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -16,6 +16,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.html.HtmlMeter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -122,7 +123,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -18,7 +18,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 org.apache.commons.lang3.ArrayUtils;
@@ -39,10 +38,9 @@
* @author Ahmed Ashour
* @author Ronald Brill
*/
-@JsxClass(domClass = HtmlExample.class, value = CHROME)
+@JsxClass(domClass = HtmlExample.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlPreformattedText.class)
-@JsxClass(domClass = HtmlListing.class, value = {CHROME, FF52})
-@JsxClass(domClass = HtmlExample.class, value = FF52)
+@JsxClass(domClass = HtmlListing.class, value = {CHROME, FF})
public class HTMLPreElement extends HTMLElement {
/** Valid values for the {@link #getClear() clear} property. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,6 +17,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 java.io.StringReader;
@@ -123,7 +124,7 @@
* Returns the scoped of this style.
* @return the scoped
*/
- @JsxGetter(FF)
+ @JsxGetter(FF52)
public boolean isScoped() {
final HtmlStyle style = (HtmlStyle) getDomNodeOrDie();
return style.hasAttribute("scoped");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,7 +17,6 @@
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
@@ -2888,7 +2887,7 @@
@Test
@Alerts(DEFAULT = "-",
CHROME = "getDistributedNodes(),select")
- @NotYetImplemented({CHROME, FF60})
+ @NotYetImplemented(CHROME)
public void content() throws Exception {
test("content");
}
|
