Menu
▾
▴
htmlunit-develop
|
From: <rb...@us...> - 2012-11-21 20:23:31
|
Revision: 7753
http://sourceforge.net/p/htmlunit/code/7753
Author: rbri
Date: 2012-11-21 20:23:29 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
% minor code performance optimization
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2012-11-21 20:22:25 UTC (rev 7752)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2012-11-21 20:23:29 UTC (rev 7753)
@@ -424,8 +424,8 @@
private void configureConstants(final ClassConfiguration config,
final ScriptableObject scriptable) {
+ final Class<?> linkedClass = config.getHostClass();
for (final String constant : config.constants()) {
- final Class<?> linkedClass = config.getHostClass();
try {
final Object value = linkedClass.getField(constant).get(null);
scriptable.defineProperty(constant, value, ScriptableObject.EMPTY);
@@ -595,14 +595,10 @@
}
private Scriptable getScope(final HtmlPage htmlPage, final DomNode htmlElement) {
- final Scriptable scope;
if (htmlElement != null) {
- scope = htmlElement.getScriptObject();
+ return htmlElement.getScriptObject();
}
- else {
- scope = (Window) htmlPage.getEnclosingWindow().getScriptObject();
- }
- return scope;
+ return (Window) htmlPage.getEnclosingWindow().getScriptObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2012-11-21 20:22:25 UTC (rev 7752)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2012-11-21 20:23:29 UTC (rev 7753)
@@ -73,8 +73,9 @@
// If this object is not case-sensitive about property names, transform the property name accordingly.
if (!caseSensitive_) {
for (final Object o : getAllIds()) {
- if (name.equalsIgnoreCase(Context.toString(o))) {
- name = Context.toString(o);
+ final String objectName = Context.toString(o);
+ if (name.equalsIgnoreCase(objectName)) {
+ name = objectName;
break;
}
}
|
|
From: <asa...@us...> - 2012-12-08 07:44:30
|
Revision: 7835
http://sourceforge.net/p/htmlunit/code/7835
Author: asashour
Date: 2012-12-08 07:44:28 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
JavaScript: fix Date.toLocaleDateString(), locally in HtmlUnit
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DateCustom.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2012-12-08 07:08:26 UTC (rev 7834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2012-12-08 07:44:28 UTC (rev 7835)
@@ -61,6 +61,7 @@
import com.gargoylesoftware.htmlunit.javascript.background.JavaScriptExecutor;
import com.gargoylesoftware.htmlunit.javascript.configuration.ClassConfiguration;
import com.gargoylesoftware.htmlunit.javascript.configuration.JavaScriptConfiguration;
+import com.gargoylesoftware.htmlunit.javascript.host.DateCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Element;
import com.gargoylesoftware.htmlunit.javascript.host.StringCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Window;
@@ -320,6 +321,9 @@
makeConstWritable(window, "undefined", "NaN", "Infinity");
}
+ final ScriptableObject datePrototype = (ScriptableObject) ScriptableObject.getClassPrototype(window, "Date");
+ datePrototype.defineFunctionProperties(new String[] {"toLocaleDateString"},
+ DateCustom.class, ScriptableObject.EMPTY);
window.setPrototypes(prototypes);
window.initialize(webWindow);
}
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DateCustom.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DateCustom.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DateCustom.java 2012-12-08 07:44:28 UTC (rev 7835)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2002-2012 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host;
+
+import java.lang.reflect.Field;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import net.sourceforge.htmlunit.corejs.javascript.Context;
+import net.sourceforge.htmlunit.corejs.javascript.Function;
+import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
+
+/**
+ * Contains some missing features of Rhino NativeDate.
+ *
+ * @version $Revision$
+ * @author Ahmed Ashour
+ */
+public final class DateCustom {
+
+ private DateCustom() { }
+
+ private static DateFormat LOCAL_DATE_FORMAT_;
+ private static Field DATE_FIELD_;
+
+ /**
+ * Converts a date to a string, returning the "date" portion using the operating system's locale's conventions.
+ * @param context the JavaScript context
+ * @param thisObj the scriptable
+ * @param args the arguments passed into the method
+ * @param function the function
+ * @return converted string
+ */
+ public static String toLocaleDateString(
+ final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
+ if (LOCAL_DATE_FORMAT_ == null) {
+ LOCAL_DATE_FORMAT_ = new SimpleDateFormat("EEEE, MMMM dd, yyyy");
+ }
+ initDateField(thisObj);
+ try {
+ final double value = (Double) DATE_FIELD_.get(thisObj);
+ return LOCAL_DATE_FORMAT_.format(new Date((long) value));
+ }
+ catch (final Exception e) {
+ throw Context.throwAsScriptRuntimeEx(e);
+ }
+ }
+
+ private static void initDateField(final Scriptable thisObj) {
+ try {
+ DATE_FIELD_ = thisObj.getClass().getDeclaredField("date");
+ DATE_FIELD_.setAccessible(true);
+ }
+ catch (final Exception e) {
+ throw Context.throwAsScriptRuntimeEx(e);
+ }
+ }
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DateCustom.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
|
|
From: <rb...@us...> - 2013-07-05 20:20:47
|
Revision: 8373
http://sourceforge.net/p/htmlunit/code/8373
Author: rbri
Date: 2013-07-05 20:20:44 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
replace some instanceof calls
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptExecutionJob.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Document.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.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/HTMLElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -52,7 +52,6 @@
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.ScriptException;
-import com.gargoylesoftware.htmlunit.SgmlPage;
import com.gargoylesoftware.htmlunit.WebAssert;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.WebWindow;
@@ -229,10 +228,12 @@
// this obj won't have prototype, constants need to be configured on it again
configureConstants(config, obj);
- if (obj.getClass() == Element.class && webWindow.getEnclosedPage() instanceof HtmlPage) {
- final DomNode domNode =
- new HtmlDivision(null, "", (SgmlPage) webWindow.getEnclosedPage(), null);
- obj.setDomNode(domNode);
+ if (obj.getClass() == Element.class) {
+ final Page page = webWindow.getEnclosedPage();
+ if (page != null && page.isHtmlPage()) {
+ final DomNode domNode = new HtmlDivision(null, "", (HtmlPage) page, null);
+ obj.setDomNode(domNode);
+ }
}
}
prototypes.put(config.getHostClass(), prototype);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -52,6 +52,7 @@
* @author Chris Erskine
* @author Daniel Gredler
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class SimpleScriptable extends ScriptableObject implements Cloneable {
@@ -287,7 +288,7 @@
if (String.class.equals(hint) || hint == null) {
if (getBrowserVersion().hasFeature(JS_OBJECT_IN_QUIRKS_MODE)) {
final Page page = getWindow().getWebWindow().getEnclosedPage();
- if (page instanceof HtmlPage && ((HtmlPage) page).isQuirksMode()) {
+ if (page != null && page.isHtmlPage() && ((HtmlPage) page).isQuirksMode()) {
return "[object]";
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptExecutionJob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptExecutionJob.java 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptExecutionJob.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -85,7 +85,7 @@
// Verify that the current page is still available and a html page
final Page enclosedPage = w.getEnclosedPage();
- if (!(enclosedPage instanceof HtmlPage)) {
+ if (enclosedPage == null || !enclosedPage.isHtmlPage()) {
if (enclosedPage == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("The page that originated this job doesn't exist anymore. Execution cancelled.");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Document.java 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Document.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -208,7 +208,7 @@
if ("on".equalsIgnoreCase(mode)) {
designMode_ = "on";
final SgmlPage page = getPage();
- if (page instanceof HtmlPage) {
+ if (page != null && page.isHtmlPage()) {
final HtmlPage htmlPage = (HtmlPage) page;
final DomNode child = htmlPage.getBody().getFirstChild();
final DomNode rangeNode = child == null ? htmlPage.getBody() : child;
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 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -153,7 +153,7 @@
attributeName = fixAttributeName(attributeName);
final Page page = getDomNodeOrDie().getPage();
final boolean supportsFlags = getBrowserVersion().hasFeature(JS_GET_ATTRIBUTE_SUPPORTS_FLAGS_IN_QUIRKS_MODE)
- && page instanceof HtmlPage && ((HtmlPage) page).isQuirksMode();
+ && page != null && page.isHtmlPage() && ((HtmlPage) page).isQuirksMode();
Object value;
if (supportsFlags && flags != null && flags == 2 && "style".equalsIgnoreCase(attributeName)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -691,7 +691,7 @@
final DomHtmlAttributeChangeListenerImpl listener = new DomHtmlAttributeChangeListenerImpl();
page.addDomChangeListener(listener);
- if (page instanceof HtmlPage) {
+ if (page.isHtmlPage()) {
((HtmlPage) page).addHtmlAttributeChangeListener(listener);
}
}
@@ -741,7 +741,7 @@
* @param enclosedPage the page containing the JavaScript
*/
public void initialize(final Page enclosedPage) {
- if (enclosedPage instanceof HtmlPage) {
+ if (enclosedPage != null && enclosedPage.isHtmlPage()) {
final HtmlPage htmlPage = (HtmlPage) enclosedPage;
// Windows don't have corresponding DomNodes so set the domNode
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 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -392,8 +392,8 @@
href = href.trim();
- final SgmlPage sgmlPage = element.getPage();
- if (!(sgmlPage instanceof HtmlPage)) {
+ final SgmlPage page = element.getPage();
+ if (page == null || !page.isHtmlPage()) {
return href;
}
@@ -409,8 +409,8 @@
anchorPart = href.substring(indexAnchor);
}
+ final HtmlPage htmlPage = (HtmlPage) page;
try {
- final HtmlPage htmlPage = (HtmlPage) sgmlPage;
final String response =
htmlPage.getFullyQualifiedUrl(beforeAnchor).toExternalForm() + anchorPart;
return response;
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 2013-07-05 20:17:57 UTC (rev 8372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2013-07-05 20:20:44 UTC (rev 8373)
@@ -571,7 +571,7 @@
protected String fixAttributeName(final String attributeName) {
if (getBrowserVersion().hasFeature(HTMLELEMENT_ATTRIBUTE_FIX_IN_QUIRKS_MODE)) {
final SgmlPage page = getDomNodeOrDie().getPage();
- if (page instanceof HtmlPage && ((HtmlPage) page).isQuirksMode()) {
+ if (page != null && page.isHtmlPage() && ((HtmlPage) page).isQuirksMode()) {
if ("className".equals(attributeName)) {
return "class";
}
|
|
From: <rb...@us...> - 2013-10-02 16:22:13
|
Revision: 8578
http://sourceforge.net/p/htmlunit/code/8578
Author: rbri
Date: 2013-10-02 16:22:06 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
split js class into two and fix the interface
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockQuoteElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLQuoteElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-10-01 17:55:25 UTC (rev 8577)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-10-02 16:22:06 UTC (rev 8578)
@@ -130,6 +130,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLBRElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLBaseElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLBaseFontElement;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLBlockQuoteElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLBodyElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLButtonElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLCanvasElement;
@@ -175,7 +176,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLParamElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLPreElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLProgressElement;
-import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLQuoteElement;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLInlineQuotationElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLScriptElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSelectElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSourceElement;
@@ -294,18 +295,19 @@
FormChild.class, FormField.class, Geolocation.class, History.class,
HTMLAnchorElement.class, HTMLAppletElement.class, HTMLAreaElement.class, HTMLAudioElement.class,
HTMLBRElement.class, HTMLBaseElement.class, HTMLBaseFontElement.class, HTMLBGSoundElement.class,
- HTMLBodyElement.class, HTMLButtonElement.class, HTMLCanvasElement.class, HTMLCollection.class,
- HTMLCollectionTags.class, HTMLDListElement.class, HTMLDelElement.class, HTMLDirectoryElement.class,
+ HTMLBlockQuoteElement.class, HTMLBodyElement.class, HTMLButtonElement.class, HTMLCanvasElement.class,
+ HTMLCollection.class, HTMLCollectionTags.class, HTMLDListElement.class,
+ HTMLDelElement.class, HTMLDirectoryElement.class,
HTMLDivElement.class, HTMLDocument.class, HTMLElement.class, HTMLEmbedElement.class, HTMLFieldSetElement.class,
HTMLFontElement.class, HTMLFormElement.class, HTMLFrameElement.class, HTMLFrameSetElement.class,
HTMLHRElement.class, HTMLHeadElement.class, HTMLHeadingElement.class, HTMLHtmlElement.class,
- HTMLIFrameElement.class, HTMLImageElement.class, HTMLInputElement.class, HTMLInsElement.class,
- HTMLIsIndexElement.class, HTMLLIElement.class, HTMLLabelElement.class, HTMLLegendElement.class,
- HTMLLinkElement.class, HTMLListElement.class, HTMLMapElement.class,
+ HTMLIFrameElement.class, HTMLImageElement.class, HTMLInlineQuotationElement.class, HTMLInputElement.class,
+ HTMLInsElement.class, HTMLIsIndexElement.class, HTMLLIElement.class, HTMLLabelElement.class,
+ HTMLLegendElement.class, HTMLLinkElement.class, HTMLListElement.class, HTMLMapElement.class,
HTMLMediaElement.class, HTMLMenuElement.class, HTMLMetaElement.class, HTMLMeterElement.class,
HTMLOListElement.class, HTMLObjectElement.class, HTMLOptGroupElement.class,
HTMLOptionElement.class, HTMLOptionsCollection.class, HTMLParagraphElement.class, HTMLParamElement.class,
- HTMLPreElement.class, HTMLProgressElement.class, HTMLQuoteElement.class, HTMLScriptElement.class,
+ HTMLPreElement.class, HTMLProgressElement.class, HTMLScriptElement.class,
HTMLSelectElement.class, HTMLSourceElement.class, HTMLSpacerElement.class, HTMLSpanElement.class,
HTMLStyleElement.class, HTMLTableCaptionElement.class, HTMLTableCellElement.class, HTMLTableColElement.class,
HTMLTableComponent.class, HTMLTableElement.class, HTMLTableRowElement.class, HTMLTableSectionElement.class,
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockQuoteElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockQuoteElement.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockQuoteElement.java 2013-10-02 16:22:06 UTC (rev 8578)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2002-2013 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host.html;
+
+import com.gargoylesoftware.htmlunit.html.HtmlBlockQuote;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+
+/**
+ * The JavaScript object "HtmlBlockQuote".
+ *
+ * @version $Revision$
+ * @author Ahmed Ashour
+ * @author Ronald Brill
+ */
+@JsxClass(domClasses = HtmlBlockQuote.class)
+public class HTMLBlockQuoteElement extends HTMLElement {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getClassName() {
+ return "HTMLQuoteElement";
+ }
+
+ /**
+ * Returns the value of the "cite" property.
+ * @return the value of the "cite" property
+ */
+ @JsxGetter
+ public String getCite() {
+ final String cite = getDomNodeOrDie().getAttribute("cite");
+ return cite;
+ }
+
+ /**
+ * Returns the value of the "cite" property.
+ * @param cite the value
+ */
+ @JsxSetter
+ public void setCite(final String cite) {
+ getDomNodeOrDie().setAttribute("cite", cite);
+ }
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockQuoteElement.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Copied: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java (from rev 8543, trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLQuoteElement.java)
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java 2013-10-02 16:22:06 UTC (rev 8578)
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2002-2013 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host.html;
+
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
+
+import com.gargoylesoftware.htmlunit.html.HtmlInlineQuotation;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
+
+/**
+ * The JavaScript object "HtmlInlineQuotation".
+ *
+ * @version $Revision$
+ * @author Ahmed Ashour
+ * @author Ronald Brill
+ */
+@JsxClass(domClasses = HtmlInlineQuotation.class)
+public class HTMLInlineQuotationElement extends HTMLElement {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getClassName() {
+ return "HTMLQuoteElement";
+ }
+
+ /**
+ * Returns the value of the "cite" property.
+ * @return the value of the "cite" property
+ */
+ @JsxGetter
+ public String getCite() {
+ final String cite = getDomNodeOrDie().getAttribute("cite");
+ return cite;
+ }
+
+ /**
+ * Returns the value of the "cite" property.
+ * @param cite the value
+ */
+ @JsxSetter
+ public void setCite(final String cite) {
+ getDomNodeOrDie().setAttribute("cite", cite);
+ }
+
+ /**
+ * Returns the value of the "dateTime" property.
+ * @return the value of the "dateTime" property
+ */
+ @JsxGetter(@WebBrowser(IE))
+ public String getDateTime() {
+ final String cite = getDomNodeOrDie().getAttribute("datetime");
+ return cite;
+ }
+
+ /**
+ * Returns the value of the "dateTime" property.
+ * @param dateTime the value
+ */
+ @JsxSetter(@WebBrowser(IE))
+ public void setDateTime(final String dateTime) {
+ getDomNodeOrDie().setAttribute("datetime", dateTime);
+ }
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ * {@inheritDoc}
+ */
+ @Override
+ public String getDefaultStyleDisplay() {
+ return "inline";
+ }
+}
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLQuoteElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLQuoteElement.java 2013-10-01 17:55:25 UTC (rev 8577)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLQuoteElement.java 2013-10-02 16:22:06 UTC (rev 8578)
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2002-2013 Gargoyle Software Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gargoylesoftware.htmlunit.javascript.host.html;
-
-import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
-
-import com.gargoylesoftware.htmlunit.html.HtmlBlockQuote;
-import com.gargoylesoftware.htmlunit.html.HtmlInlineQuotation;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
-import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
-
-/**
- * The JavaScript object "HTMLQuoteElement".
- *
- * @version $Revision$
- * @author Ahmed Ashour
- * @author Ronald Brill
- */
-@JsxClass(domClasses = { HtmlInlineQuotation.class, HtmlBlockQuote.class })
-public class HTMLQuoteElement extends HTMLElement {
-
- /**
- * Returns the value of the "cite" property.
- * @return the value of the "cite" property
- */
- @JsxGetter
- public String getCite() {
- final String cite = getDomNodeOrDie().getAttribute("cite");
- return cite;
- }
-
- /**
- * Returns the value of the "cite" property.
- * @param cite the value
- */
- @JsxSetter
- public void setCite(final String cite) {
- getDomNodeOrDie().setAttribute("cite", cite);
- }
-
- /**
- * Returns the value of the "dateTime" property.
- * @return the value of the "dateTime" property
- */
- @JsxGetter(@WebBrowser(IE))
- public String getDateTime() {
- final String cite = getDomNodeOrDie().getAttribute("datetime");
- return cite;
- }
-
- /**
- * Returns the value of the "dateTime" property.
- * @param dateTime the value
- */
- @JsxSetter(@WebBrowser(IE))
- public void setDateTime(final String dateTime) {
- getDomNodeOrDie().setAttribute("datetime", dateTime);
- }
-
- /**
- * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
- * {@inheritDoc}
- */
- @Override
- public String getDefaultStyleDisplay() {
- final String tagName = getTagName();
- if ("BLOCKQUOTE".equals(tagName)) {
- return super.getDefaultStyleDisplay();
- }
- return "inline";
- }
-}
|
|
From: <rb...@us...> - 2013-12-17 20:42:41
|
Revision: 8865
http://sourceforge.net/p/htmlunit/code/8865
Author: rbri
Date: 2013-12-17 20:42:38 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
more fixes for our javascript objects
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPhraseElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLWBRElement.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMarqueeElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-12-17 17:35:20 UTC (rev 8864)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -157,6 +157,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLLinkElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLListElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLMapElement;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLMarqueeElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLMediaElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLMenuElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLMetaElement;
@@ -187,6 +188,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTableRowElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTableSectionElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTextAreaElement;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTextElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTitleElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLUListElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLUnknownElement;
@@ -305,6 +307,7 @@
HTMLIFrameElement.class, HTMLImageElement.class, HTMLInlineQuotationElement.class, HTMLInputElement.class,
HTMLIsIndexElement.class, HTMLLIElement.class, HTMLLabelElement.class,
HTMLLegendElement.class, HTMLLinkElement.class, HTMLListElement.class, HTMLMapElement.class,
+ HTMLMarqueeElement.class,
HTMLMediaElement.class, HTMLMenuElement.class, HTMLMetaElement.class, HTMLMeterElement.class,
HTMLModElement.class,
HTMLNoShowElement.class,
@@ -315,7 +318,7 @@
HTMLSelectElement.class, HTMLSourceElement.class, HTMLSpacerElement.class, HTMLSpanElement.class,
HTMLStyleElement.class, HTMLTableCaptionElement.class, HTMLTableCellElement.class, HTMLTableColElement.class,
HTMLTableComponent.class, HTMLTableElement.class, HTMLTableRowElement.class, HTMLTableSectionElement.class,
- HTMLTextAreaElement.class, HTMLTitleElement.class,
+ HTMLTextElement.class, HTMLTextAreaElement.class, HTMLTitleElement.class,
HTMLUListElement.class, HTMLUnknownElement.class,
HTMLWBRElement.class,
HTMLVideoElement.class,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2013-12-17 17:35:20 UTC (rev 8864)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -15,6 +15,8 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
@@ -23,6 +25,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClasses;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
/**
* The JavaScript object "HTMLDivElement".
@@ -34,7 +37,7 @@
*/
@JsxClasses({
@JsxClass(domClass = HtmlDivision.class),
- @JsxClass(domClass = HtmlMarquee.class),
+ @JsxClass(domClass = HtmlMarquee.class, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) }),
})
public class HTMLDivElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java 2013-12-17 17:35:20 UTC (rev 8864)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -14,6 +14,8 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.html;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.html.HtmlInlineQuotation;
@@ -29,7 +31,8 @@
* @author Ahmed Ashour
* @author Ronald Brill
*/
-@JsxClass(domClass = HtmlInlineQuotation.class)
+@JsxClass(domClass = HtmlInlineQuotation.class,
+ browsers = { @WebBrowser(value = IE, minVersion = 9), @WebBrowser(FF), @WebBrowser(CHROME) })
public class HTMLInlineQuotationElement extends HTMLElement {
/**
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMarqueeElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMarqueeElement.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMarqueeElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2002-2013 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host.html;
+
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
+
+import com.gargoylesoftware.htmlunit.html.HtmlMarquee;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
+
+/**
+ * The JavaScript object "HTMLTextElement".
+ *
+ * @version $Revision$
+ * @author Ronald Brill
+ */
+@JsxClass(domClass = HtmlMarquee.class, browsers = @WebBrowser(IE))
+public class HTMLMarqueeElement extends HTMLElement {
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMarqueeElement.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPhraseElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPhraseElement.java 2013-12-17 17:35:20 UTC (rev 8864)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPhraseElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -32,6 +32,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlDefinition;
import com.gargoylesoftware.htmlunit.html.HtmlDeletedText;
import com.gargoylesoftware.htmlunit.html.HtmlEmphasis;
+import com.gargoylesoftware.htmlunit.html.HtmlInlineQuotation;
import com.gargoylesoftware.htmlunit.html.HtmlInsertedText;
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlKeyboard;
@@ -74,6 +75,7 @@
@JsxClass(domClass = HtmlDefinition.class),
@JsxClass(domClass = HtmlDeletedText.class, browsers = @WebBrowser(value = IE, maxVersion = 8)),
@JsxClass(domClass = HtmlEmphasis.class),
+ @JsxClass(domClass = HtmlInlineQuotation.class, browsers = @WebBrowser(value = IE, maxVersion = 8)),
@JsxClass(domClass = HtmlInsertedText.class, browsers = @WebBrowser(value = IE, maxVersion = 8)),
@JsxClass(domClass = HtmlItalic.class),
@JsxClass(domClass = HtmlKeyboard.class),
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2002-2013 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host.html;
+
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
+
+import com.gargoylesoftware.htmlunit.html.DomNode;
+import com.gargoylesoftware.htmlunit.html.DomText;
+import com.gargoylesoftware.htmlunit.html.HtmlWordBreak;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
+
+/**
+ * The JavaScript object "HTMLTextElement".
+ *
+ * @version $Revision$
+ * @author Ronald Brill
+ */
+@JsxClass(domClass = HtmlWordBreak.class, browsers = @WebBrowser(value = IE, maxVersion = 8))
+public class HTMLTextElement extends HTMLElement {
+ private boolean endTagForbidden_;
+
+ /**
+ * Sets the DOM node that corresponds to this JavaScript object.
+ * @param domNode the DOM node
+ */
+ @Override
+ public void setDomNode(final DomNode domNode) {
+ super.setDomNode(domNode);
+ if (domNode instanceof HtmlWordBreak) {
+ endTagForbidden_ = true;
+ }
+ }
+
+ /**
+ * Returns the <tt>text</tt> attribute.
+ * @return the <tt>text</tt> attribute
+ */
+ @Override
+ @JsxGetter
+ public String getText() {
+ final DomNode firstChild = getDomNodeOrDie().getFirstChild();
+ if (firstChild != null) {
+ return firstChild.getNodeValue();
+ }
+ return "";
+ }
+
+ /**
+ * Sets the <tt>text</tt> attribute.
+ * @param text the <tt>text</tt> attribute
+ */
+ @JsxSetter
+ public void setText(final String text) {
+ final DomNode htmlElement = getDomNodeOrDie();
+ DomNode firstChild = htmlElement.getFirstChild();
+ if (firstChild == null) {
+ firstChild = new DomText(htmlElement.getPage(), text);
+ htmlElement.appendChild(firstChild);
+ }
+ else {
+ firstChild.setNodeValue(text);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean isEndTagForbidden() {
+ return endTagForbidden_;
+ }
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLWBRElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLWBRElement.java 2013-12-17 17:35:20 UTC (rev 8864)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLWBRElement.java 2013-12-17 20:42:38 UTC (rev 8865)
@@ -14,8 +14,13 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.html;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
+
import com.gargoylesoftware.htmlunit.html.HtmlWordBreak;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
/**
* A JavaScript object for {@link HtmlWordBreak}.
@@ -24,7 +29,8 @@
* @author Ahmed Ashour
* @author Ronald Brill
*/
-@JsxClass(domClass = HtmlWordBreak.class)
+@JsxClass(domClass = HtmlWordBreak.class,
+ browsers = { @WebBrowser(value = IE, minVersion = 9), @WebBrowser(FF), @WebBrowser(CHROME) })
public class HTMLWBRElement extends HTMLElement {
/**
|
|
From: <asa...@us...> - 2014-10-15 07:46:50
|
Revision: 9716
http://sourceforge.net/p/htmlunit/code/9716
Author: asashour
Date: 2014-10-15 07:46:46 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
fix javadoc warnings
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Node.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -51,7 +51,7 @@
private final Map<String, ClassConfiguration> configuration_;
/**
- * Constructor is only called from {@link #getInstance(BrowserVersion)} which is synchronized.
+ * Constructor.
* @param browser the browser version to use
*/
protected AbstractJavaScriptConfiguration(final BrowserVersion browser) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -26,12 +26,11 @@
/**
* A JavaScript object for MessageEvent.
*
- * @see <a href="https://developer.mozilla.org/en/WebSockets/WebSockets_reference/MessageEvent">
- * Mozilla documentation</a>
- *
* For general information on which properties and functions should be supported, see
* <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#messageevent">
* Event definitions</a>.
+ *
+ * @see <a href="https://developer.mozilla.org/en/WebSockets/WebSockets_reference/MessageEvent">Mozilla documentation</a>
* @version $Revision$
* @author Ahmed Ashour
* @author Frank Danek
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Node.java 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Node.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -669,7 +669,7 @@
* @param listener the event listener
* @return <code>true</code> if the listener has been added
* @see <a href="http://msdn.microsoft.com/en-us/library/ms536343.aspx">MSDN documentation</a>
- * @see #addEventListener(String, Function, boolean)
+ * @see #addEventListener(String, Scriptable, boolean)
*/
@JsxFunction(@WebBrowser(value = IE, maxVersion = 8))
public boolean attachEvent(final String type, final Function listener) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -4428,12 +4428,12 @@
/**
* Converts the specified length string value into an integer number of pixels. This method does
- * <b>NOT</b> handle percentages correctly; use {@link #pixelValue(HTMLElement, CssValue)} if you
+ * <b>NOT</b> handle percentages correctly; use {@link #pixelValue(Element, CssValue)} if you
* need percentage support).
* @param value the length string value to convert to an integer number of pixels
* @return the integer number of pixels corresponding to the specified length string value
* @see <a href="http://htmlhelp.com/reference/css/units.html">CSS Units</a>
- * @see #pixelValue(HTMLElement, CssValue)
+ * @see #pixelValue(Element, CssValue)
*/
protected static int pixelValue(final String value) {
int i = NumberUtils.toInt(TO_INT_PATTERN.matcher(value).replaceAll("$1"), 0);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -1867,11 +1867,11 @@
/**
* Returns the specified length value as a pixel length value, as long as we're not emulating IE.
- * This method does <b>NOT</b> handle percentages correctly; use {@link #pixelValue(HTMLElement, CssValue)}
+ * This method does <b>NOT</b> handle percentages correctly; use {@link #pixelValue(Element, CssValue)}
* if you need percentage support).
* @param value the length value to convert to a pixel length value
* @return the specified length value as a pixel length value
- * @see #pixelString(HTMLElement, CSSStyleDeclaration.CssValue)
+ * @see #pixelString(Element, CSSStyleDeclaration.CssValue)
*/
protected String pixelString(final String value) {
if (getBrowserVersion().hasFeature(JS_LENGTH_WITHOUT_PX)) {
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 2014-10-15 07:16:51 UTC (rev 9715)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2014-10-15 07:46:46 UTC (rev 9716)
@@ -2955,7 +2955,6 @@
/**
* <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
- * {@inheritDoc}
*/
public String getDefaultStyleDisplay() {
final HtmlElement htmlElt = getDomNodeOrDie();
|
|
From: <rb...@us...> - 2014-12-14 01:17:28
|
Revision: 9812
http://sourceforge.net/p/htmlunit/code/9812
Author: rbri
Date: 2014-12-14 01:17:20 +0000 (Sun, 14 Dec 2014)
Log Message:
-----------
no longer required class removed
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollectionTags.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2014-12-13 17:38:54 UTC (rev 9811)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2014-12-14 01:17:20 UTC (rev 9812)
@@ -129,7 +129,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLButtonElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLCanvasElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLCollection;
-import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLCollectionTags;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDListElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDataListElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDefinitionDescriptionElement;
@@ -305,7 +304,7 @@
HTMLBRElement.class, HTMLBaseElement.class, HTMLBaseFontElement.class,
HTMLBlockElement.class,
HTMLBlockQuoteElement.class, HTMLBodyElement.class, HTMLButtonElement.class, HTMLCanvasElement.class,
- HTMLCollection.class, HTMLCollectionTags.class,
+ HTMLCollection.class,
HTMLDataListElement.class,
HTMLDefinitionDescriptionElement.class, HTMLDefinitionTermElement.class,
HTMLDListElement.class,
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollectionTags.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollectionTags.java 2014-12-13 17:38:54 UTC (rev 9811)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollectionTags.java 2014-12-14 01:17:20 UTC (rev 9812)
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2002-2014 Gargoyle Software Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gargoylesoftware.htmlunit.javascript.host.html;
-
-import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-
-/**
- * An array of elements. It is very similar to {@link HTMLCollection}, but with 'tags' property for Firefox.
- *
- * @version $Revision$
- * @author Ahmed Ashour
- * @author Daniel Gredler
- */
-@JsxClass
-public class HTMLCollectionTags extends HTMLCollection {
-
- /**
- * Creates an instance. JavaScript objects must have a default constructor.
- * Don't call.
- */
- @Deprecated
- public HTMLCollectionTags() {
- // Empty.
- }
-
- /**
- * Creates an instance.
- * @param parentScope parent scope
- * @param description a text useful for debugging
- */
- public HTMLCollectionTags(final DomNode parentScope, final String description) {
- super(parentScope, false, description);
- }
-
- /**
- * Called for the js "==".
- * {@inheritDoc}
- */
- @Override
- protected Object equivalentValues(final Object other) {
- if (!(other instanceof HTMLCollectionTags)) {
- return Boolean.FALSE;
- }
- return super.equivalentValues(other);
- }
-}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2014-12-13 17:38:54 UTC (rev 9811)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2014-12-14 01:17:20 UTC (rev 9812)
@@ -1143,7 +1143,7 @@
@JsxGetter
public HTMLCollection getAll() {
if (all_ == null) {
- all_ = new HTMLCollectionTags(getDomNodeOrDie(), "HTMLDocument.all") {
+ all_ = new HTMLCollection(getDomNodeOrDie(), false, "HTMLDocument.all") {
@Override
protected boolean isMatching(final DomNode node) {
return true;
|
|
From: <rb...@us...> - 2018-04-14 11:46:33
|
Revision: 15236
http://sourceforge.net/p/htmlunit/code/15236
Author: rbri
Date: 2018-04-14 11:46:24 +0000 (Sat, 14 Apr 2018)
Log Message:
-----------
getOwnPropertySymbols is available from rhino
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ObjectCustom.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-04-14 09:32:48 UTC (rev 15235)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-04-14 11:46:24 UTC (rev 15236)
@@ -66,7 +66,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.ArrayCustom;
import com.gargoylesoftware.htmlunit.javascript.host.DateCustom;
import com.gargoylesoftware.htmlunit.javascript.host.NumberCustom;
-import com.gargoylesoftware.htmlunit.javascript.host.ObjectCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Reflect;
import com.gargoylesoftware.htmlunit.javascript.host.StringCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Window;
@@ -498,9 +497,8 @@
datePrototype.defineFunctionProperties(new String[] {"toLocaleDateString", "toLocaleTimeString"},
DateCustom.class, ScriptableObject.DONTENUM);
- if (browserVersion.hasFeature(JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS)) {
- ((ScriptableObject) objectPrototype).defineFunctionProperties(new String[] {"getOwnPropertySymbols"},
- ObjectCustom.class, ScriptableObject.DONTENUM);
+ if (!browserVersion.hasFeature(JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS)) {
+ ((ScriptableObject) ScriptableObject.getProperty(window, "Object")).delete("getOwnPropertySymbols");
}
if (browserVersion.hasFeature(JS_ARRAY_FROM)) {
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ObjectCustom.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ObjectCustom.java 2018-04-14 09:32:48 UTC (rev 15235)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ObjectCustom.java 2018-04-14 11:46:24 UTC (rev 15236)
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2002-2018 Gargoyle Software Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gargoylesoftware.htmlunit.javascript.host;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.Function;
-import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
-import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
-import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
-
-/**
- * Contains some missing features of Rhino NativeObject.
- *
- * @author Ahmed Ashour
- */
-public final class ObjectCustom {
-
- private ObjectCustom() { }
-
- /**
- * Returns an array of all symbol properties found directly upon a given object.
- * @param context the JavaScript context
- * @param thisObj the scriptable
- * @param args the arguments passed into the method
- * @param function the function
- * @return array
- */
- public static Scriptable getOwnPropertySymbols(
- final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
- if (args.length == 0) {
- throw ScriptRuntime.typeError("Cannot convert undefined or null to object");
- }
- if (!(args[0] instanceof ScriptableObject)) {
- throw ScriptRuntime.typeError("Cannot convert " + Context.toString(args[0]) + " to object");
- }
- final ScriptableObject o = (ScriptableObject) args[0];
- final List<Object> list = new ArrayList<>();
- for (final Object id : o.getAllIds()) {
- if (id.toString().startsWith("Symbol(")) {
- list.add(id);
- }
- }
- return context.newArray(thisObj, list.toArray(new Object[list.size()]));
- }
-}
|
|
From: <rb...@us...> - 2018-06-16 14:57:32
|
Revision: 15329
http://sourceforge.net/p/htmlunit/code/15329
Author: rbri
Date: 2018-06-16 14:57:12 +0000 (Sat, 16 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/AudioScheduledSourceNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StorageManager.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLQuery.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLSampler.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLTransformFeedback.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLVertexArrayObject.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/WebKitCSSMatrix.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SVGZoomEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SpeechSynthesisEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/media/ConstantSourceNode.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -243,8 +243,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.event.MouseEvent;
import com.gargoylesoftware.htmlunit.javascript.host.event.MouseScrollEvent;
import com.gargoylesoftware.htmlunit.javascript.host.event.MouseWheelEvent;
-import com.gargoylesoftware.htmlunit.javascript.host.event.MozContactChangeEvent;
-import com.gargoylesoftware.htmlunit.javascript.host.event.MozSettingsEvent;
import com.gargoylesoftware.htmlunit.javascript.host.event.MutationEvent;
import com.gargoylesoftware.htmlunit.javascript.host.event.OfflineAudioCompletionEvent;
import com.gargoylesoftware.htmlunit.javascript.host.event.PageTransitionEvent;
@@ -375,7 +373,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.media.rtc.mozRTCPeerConnection;
import com.gargoylesoftware.htmlunit.javascript.host.media.rtc.mozRTCSessionDescription;
import com.gargoylesoftware.htmlunit.javascript.host.media.rtc.webkitRTCPeerConnection;
-import com.gargoylesoftware.htmlunit.javascript.host.moz.MozPowerManager;
import com.gargoylesoftware.htmlunit.javascript.host.network.NetworkInformation;
import com.gargoylesoftware.htmlunit.javascript.host.payment.PaymentAddress;
import com.gargoylesoftware.htmlunit.javascript.host.payment.PaymentRequest;
@@ -520,9 +517,8 @@
MessageEvent.class, MessagePort.class, MIDIAccess.class, MIDIConnectionEvent.class, MIDIInput.class,
MIDIInputMap.class, MIDIMessageEvent.class, MIDIOutput.class, MIDIOutputMap.class, MIDIPort.class,
MimeType.class, MimeTypeArray.class, MouseEvent.class, MouseScrollEvent.class,
- MouseWheelEvent.class, MozContactChangeEvent.class, MozCSSKeyframesRule.class,
- MozPowerManager.class, mozRTCIceCandidate.class,
- mozRTCPeerConnection.class, mozRTCSessionDescription.class, MozSettingsEvent.class,
+ MouseWheelEvent.class, MozCSSKeyframesRule.class,
+ mozRTCIceCandidate.class, mozRTCPeerConnection.class, mozRTCSessionDescription.class,
MSGestureEvent.class,
MutationEvent.class, MutationObserver.class, MutationRecord.class, NamedNodeMap.class, Namespace.class,
NamespaceCollection.class,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -25,7 +25,7 @@
*
* @author Ronald Brill
*/
-@JsxClass(FF52)
+@JsxClass(FF)
public class Animation extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/AudioScheduledSourceNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/AudioScheduledSourceNode.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/AudioScheduledSourceNode.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +26,7 @@
*
* @author Ronald Brill
*/
-@JsxClass(CHROME)
+@JsxClass({CHROME, FF60})
public class AudioScheduledSourceNode extends AudioNode {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StorageManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StorageManager.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StorageManager.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -24,8 +25,9 @@
* A JavaScript object for {@code StorageManager}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass(CHROME)
+@JsxClass({CHROME, FF60})
public class StorageManager extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,8 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-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.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -28,8 +27,9 @@
* A JavaScript object for {@code WebGL2RenderingContext}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class WebGL2RenderingContext extends SimpleScriptable {
/** The constant {@code ACTIVE_ATTRIBUTES}. */
@@ -1645,7 +1645,7 @@
public static final long STENCIL_FUNC = 2962L;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF60, IE})
+ @JsxConstant({FF, IE})
public static final long STENCIL_INDEX = 6401L;
/** The constant {@code STENCIL_INDEX8}. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLQuery.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLQuery.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLQuery.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
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.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class WebGLQuery extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLSampler.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLSampler.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLSampler.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
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.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class WebGLSampler extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLTransformFeedback.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLTransformFeedback.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLTransformFeedback.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
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.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class WebGLTransformFeedback extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLVertexArrayObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLVertexArrayObject.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLVertexArrayObject.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
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.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class WebGLVertexArrayObject extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/WebKitCSSMatrix.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/WebKitCSSMatrix.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/WebKitCSSMatrix.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -16,7 +16,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.FF52;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,8 +26,9 @@
* A JavaScript object for {@code WebKitCSSMatrix}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass({CHROME, EDGE, FF52})
+@JsxClass({CHROME, EDGE, FF})
public class WebKitCSSMatrix extends SimpleScriptable {
/**
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002-2018 Gargoyle Software Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gargoylesoftware.htmlunit.javascript.host.event;
-
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
-
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
-
-/**
- * A JavaScript object for {@code MozContactChangeEvent}.
- *
- * @author Ahmed Ashour
- */
-@JsxClass(FF60)
-public class MozContactChangeEvent extends Event {
-
- /**
- * Creates an instance.
- */
- @JsxConstructor
- public MozContactChangeEvent() {
- }
-
-}
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002-2018 Gargoyle Software Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gargoylesoftware.htmlunit.javascript.host.event;
-
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
-
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
-
-/**
- * A JavaScript object for {@code MozSettingsEvent}.
- *
- * @author Ahmed Ashour
- */
-@JsxClass(FF60)
-public class MozSettingsEvent extends Event {
-
- /**
- * Creates an instance.
- */
- @JsxConstructor
- public MozSettingsEvent() {
- }
-
-}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SVGZoomEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SVGZoomEvent.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SVGZoomEvent.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.event;
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 com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -25,14 +25,15 @@
* A JavaScript object for {@code SVGZoomEvent}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass({FF, IE, EDGE})
+@JsxClass({FF52, IE, EDGE})
public class SVGZoomEvent extends UIEvent {
/**
* Creates an instance.
*/
- @JsxConstructor({FF, EDGE})
+ @JsxConstructor({FF52, EDGE})
public SVGZoomEvent() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SpeechSynthesisEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SpeechSynthesisEvent.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/SpeechSynthesisEvent.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.event;
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.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,8 +24,9 @@
* A JavaScript object for {@code SpeechSynthesisEvent}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF})
public class SpeechSynthesisEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEvent.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEvent.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -16,7 +16,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.FF52;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +27,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({CHROME, FF52, IE, EDGE})
+@JsxClass({CHROME, FF, IE, EDGE})
public class WebGLContextEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/media/ConstantSourceNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/media/ConstantSourceNode.java 2018-06-16 14:55:34 UTC (rev 15328)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/media/ConstantSourceNode.java 2018-06-16 14:57:12 UTC (rev 15329)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.media;
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.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -26,7 +26,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({CHROME, FF52})
+@JsxClass({CHROME, FF60})
public class ConstantSourceNode extends AudioScheduledSourceNode {
/**
|
|
From: <asa...@us...> - 2015-01-30 09:02:29
|
Revision: 9930
http://sourceforge.net/p/htmlunit/code/9930
Author: asashour
Date: 2015-01-30 09:02:22 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
Fix the build
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/NodeList.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-01-30 08:40:16 UTC (rev 9929)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-01-30 09:02:22 UTC (rev 9930)
@@ -112,7 +112,12 @@
*/
@Override
public String getClassName() {
- return getClass().getSimpleName();
+ String className = getClass().getSimpleName();
+ if (className.isEmpty()) {
+ // for anonymous class
+ className = getClass().getSuperclass().getSimpleName();
+ }
+ return className;
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/NodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/NodeList.java 2015-01-30 08:40:16 UTC (rev 9929)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/NodeList.java 2015-01-30 09:02:22 UTC (rev 9930)
@@ -65,6 +65,7 @@
*/
@JsxClass
public class NodeList extends SimpleScriptable implements Function, org.w3c.dom.NodeList {
+
/**
* Cache effect of some changes.
*/
@@ -623,5 +624,4 @@
}
return getScriptableFor(object);
}
-
}
|
|
From: <asa...@us...> - 2015-02-06 14:43:56
|
Revision: 9956
http://sourceforge.net/p/htmlunit/code/9956
Author: asashour
Date: 2015-02-06 14:43:48 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
checkstyle
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/IEConditionalCompilationScriptPreProcessor.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptJobManagerImpl.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/IEConditionalCompilationScriptPreProcessor.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/IEConditionalCompilationScriptPreProcessor.java 2015-02-06 10:57:43 UTC (rev 9955)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/IEConditionalCompilationScriptPreProcessor.java 2015-02-06 14:43:48 UTC (rev 9956)
@@ -57,7 +57,7 @@
private static final Pattern IF4_PATTERN = Pattern.compile("(/\\*)?@end");
private static final String CC_VARIABLE_PREFIX = "htmlunit_cc_variable_";
- private enum PARSING_STATUS { NORMAL, IN_MULTI_LINE_COMMENT, IN_SINGLE_LINE_COMMENT, IN_STRING, IN_REG_EXP }
+ private static enum ParsingStatus { NORMAL, IN_MULTI_LINE_COMMENT, IN_SINGLE_LINE_COMMENT, IN_STRING, IN_REG_EXP }
private final Set<String> setVariables_ = new HashSet<>();
@@ -230,11 +230,11 @@
* @return the index
*/
private static int indexOf(final String sourceCode, final String str, final int fromIndex) {
- PARSING_STATUS parsingStatus = PARSING_STATUS.NORMAL;
+ ParsingStatus parsingStatus = ParsingStatus.NORMAL;
char stringChar = 0;
final int sourceCodeLength = sourceCode.length();
for (int i = 0; i < sourceCodeLength; i++) {
- if ((parsingStatus == PARSING_STATUS.NORMAL || parsingStatus == PARSING_STATUS.IN_MULTI_LINE_COMMENT)
+ if ((parsingStatus == ParsingStatus.NORMAL || parsingStatus == ParsingStatus.IN_MULTI_LINE_COMMENT)
&& i >= fromIndex && i + str.length() <= sourceCodeLength
&& sourceCode.substring(i, i + str.length()).equals(str)) {
return i;
@@ -242,54 +242,54 @@
final char ch = sourceCode.charAt(i);
switch (ch) {
case '/':
- if (parsingStatus == PARSING_STATUS.NORMAL && (i + 1 < sourceCodeLength)) {
+ if (parsingStatus == ParsingStatus.NORMAL && (i + 1 < sourceCodeLength)) {
final char nextCh = sourceCode.charAt(i + 1);
if (nextCh == '/') {
- parsingStatus = PARSING_STATUS.IN_SINGLE_LINE_COMMENT;
+ parsingStatus = ParsingStatus.IN_SINGLE_LINE_COMMENT;
}
else if (nextCh == '*') {
- parsingStatus = PARSING_STATUS.IN_MULTI_LINE_COMMENT;
+ parsingStatus = ParsingStatus.IN_MULTI_LINE_COMMENT;
}
else {
stringChar = ch;
- parsingStatus = PARSING_STATUS.IN_REG_EXP;
+ parsingStatus = ParsingStatus.IN_REG_EXP;
}
}
- else if (parsingStatus == PARSING_STATUS.IN_REG_EXP && ch == stringChar) {
+ else if (parsingStatus == ParsingStatus.IN_REG_EXP && ch == stringChar) {
stringChar = 0;
- parsingStatus = PARSING_STATUS.NORMAL;
+ parsingStatus = ParsingStatus.NORMAL;
}
break;
case '*':
- if (parsingStatus == PARSING_STATUS.IN_MULTI_LINE_COMMENT && i + 1 < sourceCodeLength) {
+ if (parsingStatus == ParsingStatus.IN_MULTI_LINE_COMMENT && i + 1 < sourceCodeLength) {
final char nextCh = sourceCode.charAt(i + 1);
if (nextCh == '/') {
- parsingStatus = PARSING_STATUS.NORMAL;
+ parsingStatus = ParsingStatus.NORMAL;
}
}
break;
case '\n':
- if (parsingStatus == PARSING_STATUS.IN_SINGLE_LINE_COMMENT) {
- parsingStatus = PARSING_STATUS.NORMAL;
+ if (parsingStatus == ParsingStatus.IN_SINGLE_LINE_COMMENT) {
+ parsingStatus = ParsingStatus.NORMAL;
}
break;
case '\'':
case '"':
- if (parsingStatus == PARSING_STATUS.NORMAL) {
+ if (parsingStatus == ParsingStatus.NORMAL) {
stringChar = ch;
- parsingStatus = PARSING_STATUS.IN_STRING;
+ parsingStatus = ParsingStatus.IN_STRING;
}
- else if (parsingStatus == PARSING_STATUS.IN_STRING && ch == stringChar) {
+ else if (parsingStatus == ParsingStatus.IN_STRING && ch == stringChar) {
stringChar = 0;
- parsingStatus = PARSING_STATUS.NORMAL;
+ parsingStatus = ParsingStatus.NORMAL;
}
break;
case '\\':
- if (parsingStatus == PARSING_STATUS.IN_STRING) {
+ if (parsingStatus == ParsingStatus.IN_STRING) {
if (i + 3 < sourceCodeLength && sourceCode.charAt(i + 1) == 'x') {
final char ch1 = Character.toUpperCase(sourceCode.charAt(i + 2));
final char ch2 = Character.toUpperCase(sourceCode.charAt(i + 3));
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptJobManagerImpl.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptJobManagerImpl.java 2015-02-06 10:57:43 UTC (rev 9955)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptJobManagerImpl.java 2015-02-06 14:43:48 UTC (rev 9956)
@@ -353,7 +353,9 @@
* {@inheritDoc}
*/
public synchronized JavaScriptJob getEarliestJob(final JavaScriptJobFilter filter) {
- if (filter == null) { return scheduledJobsQ_.peek(); }
+ if (filter == null) {
+ return scheduledJobsQ_.peek();
+ }
for (JavaScriptJob job : scheduledJobsQ_) {
if (filter.passes(job)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2015-02-06 10:57:43 UTC (rev 9955)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2015-02-06 14:43:48 UTC (rev 9956)
@@ -209,6 +209,8 @@
*/
private static int UniqueID_Counter_ = 1;
+ private static enum ParsingStatus { OUTSIDE, START, IN_NAME, INSIDE, IN_STRING }
+
private HTMLCollection all_; // has to be a member to have equality (==) working
private HTMLCollection forms_; // has to be a member to have equality (==) working
private HTMLCollection links_; // has to be a member to have equality (==) working
@@ -699,8 +701,6 @@
}
}
- private enum PARSING_STATUS { OUTSIDE, START, IN_NAME, INSIDE, IN_STRING }
-
/**
* Indicates if the content is a well formed HTML snippet that can already be parsed to be added to the DOM.
*
@@ -710,7 +710,7 @@
static boolean canAlreadyBeParsed(final String content) {
// all <script> must have their </script> because the parser doesn't close automatically this tag
// All tags must be complete, that is from '<' to '>'.
- PARSING_STATUS tagState = PARSING_STATUS.OUTSIDE;
+ ParsingStatus tagState = ParsingStatus.OUTSIDE;
int tagNameBeginIndex = 0;
int scriptTagCount = 0;
boolean tagIsOpen = true;
@@ -722,11 +722,11 @@
switch (tagState) {
case OUTSIDE:
if (currentChar == '<') {
- tagState = PARSING_STATUS.START;
+ tagState = ParsingStatus.START;
tagIsOpen = true;
}
else if (scriptTagCount > 0 && (currentChar == '\'' || currentChar == '"')) {
- tagState = PARSING_STATUS.IN_STRING;
+ tagState = ParsingStatus.IN_STRING;
stringBoundary = currentChar;
stringSkipNextChar = false;
}
@@ -739,7 +739,7 @@
else {
tagNameBeginIndex = index;
}
- tagState = PARSING_STATUS.IN_NAME;
+ tagState = ParsingStatus.IN_NAME;
break;
case IN_NAME:
if (Character.isWhitespace(currentChar) || currentChar == '>') {
@@ -754,14 +754,14 @@
}
}
if (currentChar == '>') {
- tagState = PARSING_STATUS.OUTSIDE;
+ tagState = ParsingStatus.OUTSIDE;
}
else {
- tagState = PARSING_STATUS.INSIDE;
+ tagState = ParsingStatus.INSIDE;
}
}
else if (!Character.isLetter(currentChar)) {
- tagState = PARSING_STATUS.OUTSIDE;
+ tagState = ParsingStatus.OUTSIDE;
}
break;
case INSIDE:
@@ -773,7 +773,7 @@
openingQuote = currentChar;
}
else if (currentChar == '>' && openingQuote == 0) {
- tagState = PARSING_STATUS.OUTSIDE;
+ tagState = ParsingStatus.OUTSIDE;
}
}
break;
@@ -783,7 +783,7 @@
}
else {
if (currentChar == stringBoundary) {
- tagState = PARSING_STATUS.OUTSIDE;
+ tagState = ParsingStatus.OUTSIDE;
}
else if (currentChar == '\\') {
stringSkipNextChar = true;
@@ -795,7 +795,7 @@
}
index++;
}
- if (scriptTagCount > 0 || tagState != PARSING_STATUS.OUTSIDE) {
+ if (scriptTagCount > 0 || tagState != ParsingStatus.OUTSIDE) {
if (LOG.isDebugEnabled()) {
final StringBuffer message = new StringBuffer();
message.append("canAlreadyBeParsed() retruns false for content: '");
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 2015-02-06 10:57:43 UTC (rev 9955)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2015-02-06 14:43:48 UTC (rev 9956)
@@ -1605,9 +1605,15 @@
*/
public int compareVersions(final String v1, final String v2) {
final int i = v1.compareTo(v2);
- if (i == 0) { return 0; }
- else if (i < 0) { return -1; }
- else { return 1; }
+ if (i == 0) {
+ return 0;
+ }
+ else if (i < 0) {
+ return -1;
+ }
+ else {
+ return 1;
+ }
}
/**
|
|
From: <asa...@us...> - 2015-03-03 20:53:46
|
Revision: 10083
http://sourceforge.net/p/htmlunit/code/10083
Author: asashour
Date: 2015-03-03 20:53:43 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
Remove unneeded "isDefinedInStandardsMode = true"
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Attr.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Selection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StaticNodeList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Text.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/TextRange.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.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/HTMLAreaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElement.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/HTMLButtonElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement.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/HTMLHRElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHeadElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHtmlElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIsIndexElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLIElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLinkElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMapElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOListElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTitleElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -51,7 +51,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class NamedNodeMap extends SimpleScriptable implements ScriptableWithFallbackGetter {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Attr.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Attr.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Attr.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -49,7 +49,7 @@
@JsxClass(domClass = DomAttr.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = DomAttr.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Attr extends Node {
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 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -59,7 +59,7 @@
@JsxClasses({
@JsxClass(domClass = DomElement.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = DomElement.class,
+ @JsxClass(isJSObject = false, domClass = DomElement.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class Element extends EventNode {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -68,7 +68,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Event extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -44,7 +44,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class History extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -43,7 +43,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public final class Navigator extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -45,7 +45,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Screen extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Selection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Selection.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Selection.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -48,7 +48,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Selection extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StaticNodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StaticNodeList.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StaticNodeList.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -39,7 +39,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class StaticNodeList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -44,7 +44,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Storage extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Text.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Text.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Text.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -44,7 +44,7 @@
@JsxClass(domClass = DomText.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = DomText.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class Text extends CharacterDataImpl {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/TextRange.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/TextRange.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/TextRange.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -46,7 +46,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class TextRange extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -40,7 +40,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class CSSRuleList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -102,7 +102,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class CSSStyleDeclaration extends SimpleScriptable implements ScriptableWithFallbackGetter {
/** Css important property constant. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -40,7 +40,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class CSSStyleRule extends CSSRule {
private static final Pattern SELECTOR_PARTS_PATTERN = Pattern.compile("[\\.#]?[a-zA-Z]+");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -129,7 +129,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class CSSStyleSheet extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -58,7 +58,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class StyleSheetList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -82,7 +82,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class DOMImplementation extends SimpleScriptable {
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 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -54,7 +54,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlAnchor.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
@WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlAnchor.class,
+ @JsxClass(isJSObject = false, domClass = HtmlAnchor.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class HTMLAnchorElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -37,7 +37,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlArea.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlArea.class,
+ @JsxClass(isJSObject = false, domClass = HtmlArea.class,
browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLAreaElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -41,7 +41,7 @@
@JsxClass(domClass = HtmlBreak.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlBreak.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLBRElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -35,7 +35,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlBase.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
@WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlBase.class,
+ @JsxClass(isJSObject = false, domClass = HtmlBase.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class HTMLBaseElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -33,7 +33,7 @@
*/
@JsxClasses({
@JsxClass(domClass = HtmlBaseFont.class, browsers = @WebBrowser(value = IE, minVersion = 11)),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlBaseFont.class,
+ @JsxClass(isJSObject = false, domClass = HtmlBaseFont.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class HTMLBaseFontElement extends HTMLElement {
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 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -46,7 +46,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlBody.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
@WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlBody.class,
+ @JsxClass(isJSObject = false, domClass = HtmlBody.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class HTMLBodyElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -49,7 +49,7 @@
@JsxClass(domClass = HtmlButton.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlButton.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLButtonElement extends FormField {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -64,7 +64,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLCollection extends NodeList {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -34,7 +34,7 @@
@JsxClass(domClass = HtmlDefinitionList.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlDefinitionList.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLDListElement extends HTMLListElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -38,7 +38,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlDivision.class,
browsers = { @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlDivision.class,
+ @JsxClass(isJSObject = false, domClass = HtmlDivision.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) }),
@JsxClass(domClass = HtmlMarquee.class, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) }),
})
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -37,7 +37,7 @@
@JsxClass(domClass = HtmlEmbed.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlEmbed.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLEmbedElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -37,7 +37,7 @@
@JsxClass(domClass = HtmlFieldSet.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlFieldSet.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLFieldSetElement extends FormChild {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -38,7 +38,7 @@
@JsxClass(domClass = HtmlFont.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlFont.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLFontElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -83,7 +83,7 @@
@JsxClass(domClass = HtmlForm.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlForm.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLFormElement extends HTMLElement implements Function {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -42,7 +42,7 @@
@JsxClass(domClass = HtmlFrame.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlFrame.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLFrameElement extends HTMLElement {
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 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -40,7 +40,7 @@
@JsxClass(domClass = HtmlFrameSet.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlFrameSet.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLFrameSetElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHRElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHRElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHRElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -34,7 +34,7 @@
@JsxClass(domClass = HtmlHorizontalRule.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlHorizontalRule.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLHRElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHeadElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHeadElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHeadElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -39,7 +39,7 @@
@JsxClass(domClass = HtmlHead.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlHead.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLHeadElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHtmlElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHtmlElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHtmlElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -39,7 +39,7 @@
@JsxClasses({
@JsxClass(isJSObject = true, domClass = HtmlHtml.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, domClass = HtmlHtml.class,
+ @JsxClass(isJSObject = false, domClass = HtmlHtml.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) })
})
public class HTMLHtmlElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -42,7 +42,7 @@
@JsxClass(domClass = HtmlInlineFrame.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlInlineFrame.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLIFrameElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -62,7 +62,7 @@
@JsxClass(domClass = HtmlInput.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlInput.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLInputElement extends FormField {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIsIndexElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIsIndexElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIsIndexElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -31,7 +31,7 @@
@JsxClass(isJSObject = false, isDefinedInStandardsMode = false, domClass = HtmlIsIndex.class,
browsers = { @WebBrowser(value = IE, maxVersion = 8) }),
@JsxClass(domClass = HtmlIsIndex.class, browsers = { @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLIsIndexElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLIElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLIElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLIElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -35,7 +35,7 @@
@JsxClass(domClass = HtmlListItem.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlListItem.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLLIElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -38,7 +38,7 @@
@JsxClass(domClass = HtmlLabel.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlLabel.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLLabelElement extends FormChild {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -36,7 +36,7 @@
@JsxClass(domClass = HtmlLegend.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlLegend.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLLegendElement extends FormChild {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLinkElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLinkElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLinkElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -40,7 +40,7 @@
@JsxClass(domClass = HtmlLink.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlLink.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLLinkElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMapElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMapElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMapElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -41,7 +41,7 @@
@JsxClass(domClass = HtmlMap.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlMap.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLMapElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMetaElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -36,7 +36,7 @@
@JsxClass(domClass = HtmlMeta.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlMeta.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLMetaElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOListElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOListElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOListElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -37,7 +37,7 @@
@JsxClass(domClass = HtmlOrderedList.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlOrderedList.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLOListElement extends HTMLListElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -48,7 +48,7 @@
@JsxClass(domClass = HtmlObject.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlObject.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLObjectElement extends FormChild implements Wrapper {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -38,7 +38,7 @@
@JsxClass(domClass = HtmlParagraph.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlParagraph.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLParagraphElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -35,7 +35,7 @@
@JsxClass(domClass = HtmlParameter.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlParameter.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLParamElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -47,7 +47,7 @@
@JsxClass(domClass = HtmlScript.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlScript.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLScriptElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -53,7 +53,7 @@
@JsxClass(domClass = HtmlSelect.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlSelect.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLSelectElement extends FormField {
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 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -48,7 +48,7 @@
@JsxClass(domClass = HtmlStyle.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlStyle.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLStyleElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -39,7 +39,7 @@
@JsxClass(domClass = HtmlCaption.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlCaption.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLTableCaptionElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -56,7 +56,7 @@
@JsxClass(domClass = HtmlTableCell.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlTableCell.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLTableCellElement extends HTMLTableComponent {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -42,11 +42,11 @@
@JsxClass(domClass = HtmlTableColumn.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlTableColumn.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8)),
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8)),
@JsxClass(domClass = HtmlTableColumnGroup.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlTableColumnGroup.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLTableColElement extends HTMLTableComponent {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -58,7 +58,7 @@
@JsxClass(domClass = HtmlTable.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlTable.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLTableElement extends RowContainer {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -55,7 +55,7 @@
@JsxClass(domClass = HtmlTableRow.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
@JsxClass(domClass = HtmlTableRow.class,
- isJSObject = false, isDefinedInStandardsMode = true, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class HTMLTableRowElement extends HTMLTableComponent {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElement.java 2015-03-03 13:58:10 UTC (rev 10082)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElement.java 2015-03-03 20:53:43 UTC (rev 10083)
@@ -46,15 +46,15 @@
@JsxClas...
[truncated message content] |
|
From: <asa...@us...> - 2015-03-27 22:55:29
|
Revision: 10234
http://sourceforge.net/p/htmlunit/code/10234
Author: asashour
Date: 2015-03-27 22:55:26 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
Fix the build
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMediaElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-03-27 15:14:16 UTC (rev 10233)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-03-27 22:55:26 UTC (rev 10234)
@@ -129,13 +129,15 @@
* @return the attribute node, <code>null</code> if the attribute is not defined
*/
public Object getNamedItemWithoutSytheticClassAttr(final String name) {
- final DomNode attr = (DomNode) attributes_.getNamedItem(name);
- if (attr != null) {
- return attr.getScriptObject();
+ if (attributes_ != null) {
+ final DomNode attr = (DomNode) attributes_.getNamedItem(name);
+ if (attr != null) {
+ return attr.getScriptObject();
+ }
+ if (!"className".equals(name) && useRecursiveAttributeForIE() && isRecursiveAttribute(name)) {
+ return getUnspecifiedAttributeNode(name);
+ }
}
- if (!"className".equals(name) && useRecursiveAttributeForIE() && isRecursiveAttribute(name)) {
- return getUnspecifiedAttributeNode(name);
- }
return null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMediaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMediaElement.java 2015-03-27 15:14:16 UTC (rev 10233)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMediaElement.java 2015-03-27 22:55:26 UTC (rev 10234)
@@ -34,30 +34,52 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class HTMLMediaElement extends HTMLElement {
+ /**
+ * No information is available about the media resource.
+ */
@JsxConstant
public static final short HAVE_NOTHING = 0;
+ /**
+ * Enough of the media resource has been retrieved that the metadata attributes are initialized.
+ * Seeking will no longer raise an exception.
+ */
@JsxConstant
public static final short HAVE_METADATA = 1;
+ /**
+ * Data is available for the current playback position, but not enough to actually play more than one frame.
+ */
@JsxConstant
public static final short HAVE_CURRENT_DATA = 2;
+ /**
+ * Data for the current playback position as well as for at least a little bit of time
+ * into the future is available (in other words, at least two frames of video, for example).
+ */
@JsxConstant
public static final short HAVE_FUTURE_DATA = 3;
+ /**
+ * Enough data is available—and the download rate is high enough—that the media
+ * can be played through to the end without interruption.
+ */
@JsxConstant
public static final short HAVE_ENOUGH_DATA = 4;
+ /** There is no data yet. The {@link #getReadyState} is also {@link #HAVE_NOTHING}. */
@JsxConstant
public static final short NETWORK_EMPTY = 0;
+ /** Network is idle. */
@JsxConstant
public static final short NETWORK_IDLE = 1;
+ /** The media is loading. */
@JsxConstant
public static final short NETWORK_LOADING = 2;
+ /** There is no source. */
@JsxConstant
public static final short NETWORK_NO_SOURCE = 3;
|
|
From: <rb...@us...> - 2015-05-06 18:37:21
|
Revision: 10425
http://sourceforge.net/p/htmlunit/code/10425
Author: rbri
Date: 2015-05-06 18:37:19 +0000 (Wed, 06 May 2015)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BasicJavaScriptJob.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeIterator.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TreeWalker.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -163,7 +163,7 @@
// this method gets called by Context.compileString and by ScriptRuntime.evalSpecial
// which is used for window.eval. We have to take care in which case we are.
- final boolean isWindowEval = (compiler != null);
+ final boolean isWindowEval = compiler != null;
// Remove HTML comments around the source if needed
if (!isWindowEval) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -738,7 +738,7 @@
final HtmlPage htmlPage,
final Function javaScriptFunction,
final Scriptable thisObject,
- final Object [] args,
+ final Object[] args,
final DomNode htmlElement) {
final Scriptable scope = getScope(htmlPage, htmlElement);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -196,7 +196,7 @@
@Override
public Object get(final String name, final Scriptable start) {
if ("prototype".equals(name)) {
- switch(super.getFunctionName()) {
+ switch (super.getFunctionName()) {
case "CSS":
case "Proxy":
return NOT_FOUND;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BasicJavaScriptJob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BasicJavaScriptJob.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BasicJavaScriptJob.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -57,7 +57,7 @@
initialDelay_ = initialDelay;
period_ = period;
setTargetExecutionTime(initialDelay + System.currentTimeMillis());
- executeAsap_ = (initialDelay == 0); // XHR are currently run as jobs and should be prioritary
+ executeAsap_ = initialDelay == 0; // XHR are currently run as jobs and should be prioritary
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -3987,13 +3987,13 @@
if (zIndex instanceof Number) {
final Number number = (Number) zIndex;
if (number.doubleValue() % 1 == 0) {
- setStyleAttribute(Z_INDEX, (Integer.toString(number.intValue())));
+ setStyleAttribute(Z_INDEX, Integer.toString(number.intValue()));
}
return;
}
try {
final int i = Integer.parseInt(zIndex.toString());
- setStyleAttribute(Z_INDEX, (Integer.toString(i)));
+ setStyleAttribute(Z_INDEX, Integer.toString(i));
}
catch (final NumberFormatException e) {
// ignore
@@ -4046,7 +4046,7 @@
// TODO: rework the whole CSS processing here! we should *always* parse the style!
if (styleDeclaration_ == null) {
final String uri = getDomNodeOrDie().getPage().getWebResponse().getWebRequest()
- .getUrl().toExternalForm();
+ .getUrl().toExternalForm();
final String styleAttribute = jsElement_.getDomNodeOrDie().getAttribute("style");
final InputSource source = new InputSource(new StringReader(styleAttribute));
source.setURI(uri);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -626,12 +626,12 @@
return element == element.getPage().getDocumentElement();
}
else if ("enabled".equals(value)) {
- return (element instanceof DisabledElement && !((DisabledElement) element).isDisabled());
+ return element instanceof DisabledElement && !((DisabledElement) element).isDisabled();
}
- else if ("disabled".equals(value)) {
- return (element instanceof DisabledElement && ((DisabledElement) element).isDisabled());
+ if ("disabled".equals(value)) {
+ return element instanceof DisabledElement && ((DisabledElement) element).isDisabled();
}
- else if ("focus".equals(value)) {
+ if ("focus".equals(value)) {
final HtmlPage htmlPage = element.getHtmlPageOrNull();
if (htmlPage != null) {
final HtmlElement focus = htmlPage.getFocusedElement();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -1152,7 +1152,7 @@
}
});
}
- width -= (getBorderHorizontal() + getPaddingHorizontal());
+ width -= getBorderHorizontal() + getPaddingHorizontal();
}
else if (node instanceof HtmlSubmitInput || node instanceof HtmlResetInput
|| node instanceof HtmlButtonInput || node instanceof HtmlButton
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeIterator.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeIterator.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeIterator.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -201,7 +201,7 @@
}
Function function = null;
if (filter_ instanceof Function) {
- function = ((Function) filter_);
+ function = (Function) filter_;
}
final Object acceptNode = filter_.get("acceptNode", filter_);
if (acceptNode instanceof Function) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -92,11 +92,11 @@
Range(final org.w3c.dom.ranges.Range w3cRange) {
final DomNode domNodeStartContainer = (DomNode) w3cRange.getStartContainer();
- startContainer_ = (Node) (domNodeStartContainer).getScriptObject();
+ startContainer_ = (Node) domNodeStartContainer.getScriptObject();
startOffset_ = w3cRange.getStartOffset();
final DomNode domNodeEndContainer = (DomNode) w3cRange.getEndContainer();
- endContainer_ = (Node) (domNodeEndContainer).getScriptObject();
+ endContainer_ = (Node) domNodeEndContainer.getScriptObject();
endOffset_ = w3cRange.getEndOffset();
}
@@ -209,7 +209,7 @@
*/
@JsxGetter
public boolean getCollapsed() {
- return (startContainer_ == endContainer_ && startOffset_ == endOffset_);
+ return startContainer_ == endContainer_ && startOffset_ == endOffset_;
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -137,7 +137,7 @@
@JsxGetter({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
public boolean getIsCollapsed() {
final List<Range> ranges = getRanges();
- return (ranges.isEmpty() || (ranges.size() == 1 && ranges.get(0).getCollapsed()));
+ return ranges.isEmpty() || (ranges.size() == 1 && ranges.get(0).getCollapsed());
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -317,7 +317,7 @@
moveBy -= to;
}
else if (to >= textLength) {
- moveBy -= (to - textLength);
+ moveBy -= to - textLength;
}
return moveBy;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TreeWalker.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TreeWalker.java 2015-05-06 18:36:47 UTC (rev 10424)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TreeWalker.java 2015-05-06 18:37:19 UTC (rev 10425)
@@ -245,7 +245,7 @@
/* Returns whether the node is skipped by the TreeWalker. */
private boolean isNodeSkipped(final Node n) {
- return (!isNodeVisible(n) && !isNodeRejected(n));
+ return !isNodeVisible(n) && !isNodeRejected(n);
}
/**
|
|
From: <rb...@us...> - 2015-05-06 19:27:01
|
Revision: 10430
http://sourceforge.net/p/htmlunit/code/10430
Author: rbri
Date: 2015-05-06 19:26:58 +0000 (Wed, 06 May 2015)
Log Message:
-----------
bring checkstyle version in sync with eclipse plugin
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/External.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/KeyboardEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MouseEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -50,10 +50,10 @@
* @see <a href="http://msdn2.microsoft.com/en-us/library/ms763824.aspx">IXMLDOMNamedNodeMap</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(FF)),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(FF)),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class NamedNodeMap extends SimpleScriptable implements ScriptableWithFallbackGetter {
private final org.w3c.dom.NamedNodeMap attributes_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -46,9 +46,9 @@
* @see <a href="https://developer.mozilla.org/en/nsIDOMOfflineResourceList">Mozilla Documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(className = "OfflineResourceList", browsers = @WebBrowser(FF))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(className = "OfflineResourceList", browsers = @WebBrowser(FF))
+ })
public class ApplicationCache extends EventTarget {
/** The object isn't associated with an application cache. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -34,13 +34,13 @@
* @see <a href="http://msdn2.microsoft.com/en-us/library/ms535906.aspx">MSDN Documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, maxVersion = 24),
- @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) }),
- @JsxClass(className = "DOMRect",
- browsers = { @WebBrowser(value = FF, minVersion = 31) })
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, maxVersion = 24),
+ @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
+ browsers = { @WebBrowser(value = IE, maxVersion = 8) }),
+ @JsxClass(className = "DOMRect",
+ browsers = { @WebBrowser(value = FF, minVersion = 31) })
+ })
public class ClientRect extends SimpleScriptable {
private int bottom_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -50,9 +50,9 @@
* @author Andrea Martino
*/
@JsxClasses({
- @JsxClass(isJSObject = false, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) }),
- @JsxClass(browsers = @WebBrowser(value = IE, minVersion = 11))
-})
+ @JsxClass(isJSObject = false, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) }),
+ @JsxClass(browsers = @WebBrowser(value = IE, minVersion = 11))
+ })
public class Console extends SimpleScriptable {
private static final Map<String, Long> TIMERS = new HashMap<>();
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 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -60,11 +60,11 @@
* @author Frank Danek
*/
@JsxClasses({
- @JsxClass(domClass = DomElement.class,
- browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, domClass = DomElement.class,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) })
-})
+ @JsxClass(domClass = DomElement.class,
+ browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, domClass = DomElement.class,
+ browsers = { @WebBrowser(value = IE, maxVersion = 8) })
+ })
public class Element extends EventNode {
private NamedNodeMap attributes_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Event.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -67,9 +67,9 @@
* @author Frank Danek
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class Event extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/External.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/External.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/External.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -33,9 +33,9 @@
* @author Ahmed Ashour
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(value = FF, minVersion = 31) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false)
-})
+ @JsxClass(browsers = { @WebBrowser(value = FF, minVersion = 31) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false)
+ })
public class External extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -43,9 +43,9 @@
* @author Ahmed Ashour
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class History extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/KeyboardEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/KeyboardEvent.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/KeyboardEvent.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -40,9 +40,10 @@
* @author Frank Danek
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
+ browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class KeyboardEvent extends UIEvent {
/** Constant for DOM_VK_MULTIPLY. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -67,9 +67,9 @@
* @see <a href="http://msdn.microsoft.com/en-us/library/ms535866.aspx">MSDN Documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class Location extends SimpleScriptable {
private static final Log LOG = LogFactory.getLog(Location.class);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageEvent.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -39,9 +39,10 @@
* @author Frank Danek
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
+ browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class MessageEvent extends Event {
private Object data_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MouseEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MouseEvent.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MouseEvent.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -47,9 +47,10 @@
* @author Frank Danek
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
+ browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class MouseEvent extends UIEvent {
/** The click event type, triggered by "onclick" event handlers. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -42,9 +42,9 @@
* @see <a href="http://msdn.microsoft.com/en-us/library/ms535867.aspx">MSDN documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class Navigator extends SimpleScriptable {
private PluginArray plugins_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -43,9 +43,9 @@
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref.html">Mozilla documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class Screen extends SimpleScriptable {
private int bufferDepth_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-05-06 19:26:16 UTC (rev 10429)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-05-06 19:26:58 UTC (rev 10430)
@@ -43,9 +43,9 @@
* @author Marc Guillemot
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
-})
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
+ @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ })
public class Storage extends SimpleScriptable {
private static List<String> RESERVED_NAMES_ = Arrays.asList("clear", "key", "getItem", "length", "removeItem",
|
|
From: <asa...@us...> - 2015-05-08 09:52:19
|
Revision: 10436
http://sourceforge.net/p/htmlunit/code/10436
Author: asashour
Date: 2015-05-08 09:52:17 +0000 (Fri, 08 May 2015)
Log Message:
-----------
String.trimLeft/Right are now defined in Rhino.
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-05-08 09:28:07 UTC (rev 10435)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-05-08 09:52:17 UTC (rev 10436)
@@ -402,11 +402,9 @@
if (!browserVersion.hasFeature(STRING_TRIM)) {
removePrototypeProperties(window, "String", "trim");
}
- if (browserVersion.hasFeature(STRING_TRIM_LEFT_RIGHT)) {
- final ScriptableObject stringPrototype =
- (ScriptableObject) ScriptableObject.getClassPrototype(window, "String");
- stringPrototype.defineFunctionProperties(new String[] {"trimLeft", "trimRight"},
- StringCustom.class, ScriptableObject.EMPTY);
+ if (!browserVersion.hasFeature(STRING_TRIM_LEFT_RIGHT)) {
+ removePrototypeProperties(window, "String", "trimLeft");
+ removePrototypeProperties(window, "String", "trimRight");
}
if (browserVersion.hasFeature(STRING_CONTAINS)) {
final ScriptableObject stringPrototype =
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java 2015-05-08 09:28:07 UTC (rev 10435)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java 2015-05-08 09:52:17 UTC (rev 10436)
@@ -16,7 +16,6 @@
import net.sourceforge.htmlunit.corejs.javascript.Context;
import net.sourceforge.htmlunit.corejs.javascript.Function;
-import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
/**
@@ -31,50 +30,6 @@
private StringCustom() { }
/**
- * Removes whitespace from the left end of the string.
- * @param context the JavaScript context
- * @param thisObj the scriptable
- * @param args the arguments passed into the method
- * @param function the function
- * @return the left trimmed string
- */
- public static String trimLeft(
- final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
- final String string = Context.toString(thisObj);
- int start = 0;
- final int length = string.length();
- while (start < length && ScriptRuntime.isJSWhitespaceOrLineTerminator(string.charAt(start))) {
- start++;
- }
- if (start == 0) {
- return string;
- }
- return string.substring(start, length);
- }
-
- /**
- * Removes whitespace from the right end of the string.
- * @param context the JavaScript context
- * @param thisObj the scriptable
- * @param args the arguments passed into the method
- * @param function the function
- * @return the right trimmed string
- */
- public static String trimRight(
- final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
- final String string = Context.toString(thisObj);
- final int length = string.length();
- int end = length;
- while (end > 0 && ScriptRuntime.isJSWhitespaceOrLineTerminator(string.charAt(end - 1))) {
- end--;
- }
- if (end == length) {
- return string;
- }
- return string.substring(0, end);
- }
-
- /**
* Determines whether one string may be found within another string,
* returning true or false as appropriate.
* @param context the JavaScript context
|
|
From: <asa...@us...> - 2015-05-08 14:38:40
|
Revision: 10440
http://sourceforge.net/p/htmlunit/code/10440
Author: asashour
Date: 2015-05-08 14:38:38 +0000 (Fri, 08 May 2015)
Log Message:
-----------
window.performance
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-05-08 10:42:03 UTC (rev 10439)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-05-08 14:38:38 UTC (rev 10440)
@@ -317,7 +317,7 @@
@Override
public Object getDefaultValue(final Class<?> hint) {
if (String.class.equals(hint) || hint == null) {
- if (getBrowserVersion().hasFeature(JS_OBJECT_IN_QUIRKS_MODE)) {
+ if (getParentScope() != null && getBrowserVersion().hasFeature(JS_OBJECT_IN_QUIRKS_MODE)) {
final Page page = getWindow().getWebWindow().getEnclosedPage();
if (page != null && page.isHtmlPage() && ((HtmlPage) page).isQuirksMode()) {
return "[object]";
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-05-08 10:42:03 UTC (rev 10439)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-05-08 14:38:38 UTC (rev 10440)
@@ -2202,6 +2202,18 @@
}
return port;
}
+
+ /**
+ * Returns the {@code performance} property.
+ * @return the {@code performance} property
+ */
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ public Performance getPerformance() {
+ final Performance performance = new Performance();
+ performance.setParentScope(getParentScope());
+ performance.setPrototype(getPrototype(performance.getClass()));
+ return performance;
+ }
}
class HTMLCollectionFrames extends HTMLCollection {
@@ -2265,16 +2277,4 @@
}
}
}
-
- /**
- * Returns the {@code performance} property.
- * @return the {@code performance} property
- */
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
- public Performance getPerformance() {
- final Performance performance = new Performance();
- performance.setParentScope(getParentScope());
- performance.setPrototype(getPrototype(performance.getClass()));
- return performance;
- }
}
|
|
From: <asa...@us...> - 2015-05-13 20:25:13
|
Revision: 10463
http://sourceforge.net/p/htmlunit/code/10463
Author: asashour
Date: 2015-05-13 20:25:10 +0000 (Wed, 13 May 2015)
Log Message:
-----------
FF38
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DeviceStorage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Symbol.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakSet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/CryptoKey.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCrypto.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/RadioNodeList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/DeviceStorageChangeEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/Blob.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileHandle.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileRequest.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/LockedFile.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPictureElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMmsEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMobileMessageManager.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsFilter.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsSegmentInfo.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGNumber.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestEventTarget.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -50,8 +50,10 @@
* @see <a href="http://msdn2.microsoft.com/en-us/library/ms763824.aspx">IXMLDOMNamedNodeMap</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, browsers = @WebBrowser(FF)),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+ @WebBrowser(value = FF, minVersion = 38) }),
+ @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
+ browsers = @WebBrowser(value = FF, maxVersion = 31)),
@JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
})
public class NamedNodeMap extends SimpleScriptable implements ScriptableWithFallbackGetter {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DeviceStorage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DeviceStorage.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DeviceStorage.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class DeviceStorage extends EventTarget {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -89,7 +89,7 @@
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public Location() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -57,7 +57,7 @@
/**
* Public default constructor only for the prototype.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public Storage() {
store_ = null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Symbol.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Symbol.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Symbol.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +28,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(CHROME))
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public class Symbol extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakSet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakSet.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakSet.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import java.util.Collections;
import java.util.WeakHashMap;
@@ -36,7 +37,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(CHROME))
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public class WeakSet extends SimpleScriptable {
private transient java.util.Set<Object> set_ = Collections.newSetFromMap(new WeakHashMap<Object, Boolean>());
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/CryptoKey.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/CryptoKey.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/CryptoKey.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.crypto;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +28,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(CHROME))
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public class CryptoKey extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCrypto.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCrypto.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/crypto/SubtleCrypto.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.crypto;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -28,7 +29,8 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = {@WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+@JsxClass(browsers = {@WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38),
+ @WebBrowser(value = IE, minVersion = 11) })
public class SubtleCrypto extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -50,7 +50,7 @@
/**
* Creates a new instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public CSSRuleList() {
stylesheet_ = null;
rules_ = null;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/RadioNodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/RadioNodeList.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/RadioNodeList.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.dom;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -26,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(CHROME))
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public class RadioNodeList extends NodeList {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -122,7 +122,7 @@
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public XPathResult() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/DeviceStorageChangeEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/DeviceStorageChangeEvent.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/DeviceStorageChangeEvent.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class DeviceStorageChangeEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/Blob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/Blob.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/Blob.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -35,7 +35,8 @@
/**
* Creates an instance.
*/
- @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+ @WebBrowser(value = FF, minVersion = 38) })
public Blob() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -34,7 +34,7 @@
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public File() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileHandle.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileHandle.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileHandle.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class FileHandle extends EventTarget {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileRequest.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileRequest.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class FileRequest extends DOMRequest {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/LockedFile.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/LockedFile.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/LockedFile.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class LockedFile extends EventTarget {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -25,6 +25,7 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_ITEM_SUPPORTS_DOUBLE_INDEX_ALSO;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_OBJECT_DETECTION;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import java.util.ArrayList;
@@ -55,7 +56,7 @@
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public HTMLAllCollection() {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPictureElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPictureElement.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPictureElement.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import com.gargoylesoftware.htmlunit.html.HtmlPicture;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +28,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(domClass = HtmlPicture.class, browsers = @WebBrowser(CHROME))
+@JsxClass(domClass = HtmlPicture.class, browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public class HTMLPictureElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMmsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMmsEvent.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMmsEvent.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class MozMmsEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMobileMessageManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMobileMessageManager.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozMobileMessageManager.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -26,7 +26,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class MozMobileMessageManager extends EventTarget {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsEvent.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsEvent.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -27,7 +27,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class MozSmsEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsFilter.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsFilter.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsFilter.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -26,7 +26,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class MozSmsFilter extends SimpleScriptable {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsSegmentInfo.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsSegmentInfo.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozSmsSegmentInfo.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -26,7 +26,7 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = @WebBrowser(FF))
+@JsxClass(browsers = @WebBrowser(value = FF, maxVersion = 31))
public class MozSmsSegmentInfo extends SimpleScriptable {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGNumber.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGNumber.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGNumber.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -35,7 +35,7 @@
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public SVGNumber() {
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestEventTarget.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestEventTarget.java 2015-05-13 19:46:48 UTC (rev 10462)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestEventTarget.java 2015-05-13 20:25:10 UTC (rev 10463)
@@ -15,6 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.xml;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -28,13 +29,14 @@
* @version $Revision$
* @author Ahmed Ashour
*/
-@JsxClass(browsers = {@WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+@JsxClass(browsers = {@WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38),
+ @WebBrowser(value = IE, minVersion = 11) })
public class XMLHttpRequestEventTarget extends SimpleScriptable {
/**
* Creates an instance.
*/
- @JsxConstructor(@WebBrowser(CHROME))
+ @JsxConstructor({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 38) })
public XMLHttpRequestEventTarget() {
}
|
|
From: <asa...@us...> - 2015-06-15 20:38:43
|
Revision: 10726
http://sourceforge.net/p/htmlunit/code/10726
Author: asashour
Date: 2015-06-15 20:38:40 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
SVG constants
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEBlendElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEColorMatrixElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFECompositeElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEConvolveMatrixElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEDisplacementMapElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEMorphologyElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFETurbulenceElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLength.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLinearGradientElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMarkerElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPathSeg.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPreserveAspectRatio.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGRenderingIntent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGSVGElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextContentElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextPathElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTransform.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGUnitTypes.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewSpec.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -97,8 +97,8 @@
}
/**
- * Add the a static property to the configuration.
- * @param name name of the property
+ * Add the static property to the configuration.
+ * @param name name of the static property
* @param getter the static getter method
* @param setter the static setter method
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEBlendElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEBlendElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEBlendElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeBlend;
@@ -33,6 +34,25 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFEBlendElement extends SVGElement {
+ /** The constant {@code SVG_FEBLEND_MODE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_UNKNOWN = 0;
+ /** The constant {@code SVG_FEBLEND_MODE_NORMAL}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_NORMAL = 1;
+ /** The constant {@code SVG_FEBLEND_MODE_MULTIPLY}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_MULTIPLY = 2;
+ /** The constant {@code SVG_FEBLEND_MODE_SCREEN}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_SCREEN = 3;
+ /** The constant {@code SVG_FEBLEND_MODE_DARKEN}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_DARKEN = 4;
+ /** The constant {@code SVG_FEBLEND_MODE_LIGHTEN}. */
+ @JsxConstant
+ public static final int SVG_FEBLEND_MODE_LIGHTEN = 5;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEColorMatrixElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEColorMatrixElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEColorMatrixElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeColorMatrix;
@@ -33,6 +34,22 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFEColorMatrixElement extends SVGElement {
+ /** The constant {@code SVG_FECOLORMATRIX_TYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
+ /** The constant {@code SVG_FECOLORMATRIX_TYPE_MATRIX}. */
+ @JsxConstant
+ public static final int SVG_FECOLORMATRIX_TYPE_MATRIX = 1;
+ /** The constant {@code SVG_FECOLORMATRIX_TYPE_SATURATE}. */
+ @JsxConstant
+ public static final int SVG_FECOLORMATRIX_TYPE_SATURATE = 2;
+ /** The constant {@code SVG_FECOLORMATRIX_TYPE_HUEROTATE}. */
+ @JsxConstant
+ public static final int SVG_FECOLORMATRIX_TYPE_HUEROTATE = 3;
+ /** The constant {@code SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA}. */
+ @JsxConstant
+ public static final int SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA = 4;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFECompositeElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFECompositeElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFECompositeElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeComposite;
@@ -33,6 +34,28 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFECompositeElement extends SVGElement {
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_OVER}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_OVER = 1;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_IN}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_IN = 2;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_OUT}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_OUT = 3;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_ATOP}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_ATOP = 4;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_XOR}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_XOR = 5;
+ /** The constant {@code SVG_FECOMPOSITE_OPERATOR_ARITHMETIC}. */
+ @JsxConstant
+ public static final int SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEConvolveMatrixElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEConvolveMatrixElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEConvolveMatrixElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeConvolveMatrix;
@@ -33,6 +34,19 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFEConvolveMatrixElement extends SVGElement {
+ /** The constant {@code SVG_EDGEMODE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_EDGEMODE_UNKNOWN = 0;
+ /** The constant {@code SVG_EDGEMODE_DUPLICATE}. */
+ @JsxConstant
+ public static final int SVG_EDGEMODE_DUPLICATE = 1;
+ /** The constant {@code SVG_EDGEMODE_WRAP}. */
+ @JsxConstant
+ public static final int SVG_EDGEMODE_WRAP = 2;
+ /** The constant {@code SVG_EDGEMODE_NONE}. */
+ @JsxConstant
+ public static final int SVG_EDGEMODE_NONE = 3;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEDisplacementMapElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEDisplacementMapElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEDisplacementMapElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeDisplacementMap;
@@ -33,6 +34,22 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFEDisplacementMapElement extends SVGElement {
+ /** The constant {@code SVG_CHANNEL_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_CHANNEL_UNKNOWN = 0;
+ /** The constant {@code SVG_CHANNEL_R}. */
+ @JsxConstant
+ public static final int SVG_CHANNEL_R = 1;
+ /** The constant {@code SVG_CHANNEL_G}. */
+ @JsxConstant
+ public static final int SVG_CHANNEL_G = 2;
+ /** The constant {@code SVG_CHANNEL_B}. */
+ @JsxConstant
+ public static final int SVG_CHANNEL_B = 3;
+ /** The constant {@code SVG_CHANNEL_A}. */
+ @JsxConstant
+ public static final int SVG_CHANNEL_A = 4;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEMorphologyElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEMorphologyElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFEMorphologyElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeMorphology;
@@ -33,6 +34,16 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFEMorphologyElement extends SVGElement {
+ /** The constant {@code SVG_MORPHOLOGY_OPERATOR_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_MORPHOLOGY_OPERATOR_UNKNOWN = 0;
+ /** The constant {@code SVG_MORPHOLOGY_OPERATOR_ERODE}. */
+ @JsxConstant
+ public static final int SVG_MORPHOLOGY_OPERATOR_ERODE = 1;
+ /** The constant {@code SVG_MORPHOLOGY_OPERATOR_DILATE}. */
+ @JsxConstant
+ public static final int SVG_MORPHOLOGY_OPERATOR_DILATE = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFETurbulenceElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFETurbulenceElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFETurbulenceElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgFeTurbulence;
@@ -33,6 +34,25 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGFETurbulenceElement extends SVGElement {
+ /** The constant {@code SVG_STITCHTYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_STITCHTYPE_UNKNOWN = 0;
+ /** The constant {@code SVG_TURBULENCE_TYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_TURBULENCE_TYPE_UNKNOWN = 0;
+ /** The constant {@code SVG_STITCHTYPE_STITCH}. */
+ @JsxConstant
+ public static final int SVG_STITCHTYPE_STITCH = 1;
+ /** The constant {@code SVG_TURBULENCE_TYPE_FRACTALNOISE}. */
+ @JsxConstant
+ public static final int SVG_TURBULENCE_TYPE_FRACTALNOISE = 1;
+ /** The constant {@code SVG_STITCHTYPE_NOSTITCH}. */
+ @JsxConstant
+ public static final int SVG_STITCHTYPE_NOSTITCH = 2;
+ /** The constant {@code SVG_TURBULENCE_TYPE_TURBULENCE}. */
+ @JsxConstant
+ public static final int SVG_TURBULENCE_TYPE_TURBULENCE = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -31,6 +32,19 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGGradientElement extends SVGElement {
+ /** The constant {@code SVG_SPREADMETHOD_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_UNKNOWN = 0;
+ /** The constant {@code SVG_SPREADMETHOD_PAD}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_PAD = 1;
+ /** The constant {@code SVG_SPREADMETHOD_REFLECT}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_REFLECT = 2;
+ /** The constant {@code SVG_SPREADMETHOD_REPEAT}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_REPEAT = 3;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLength.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLength.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLength.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -32,6 +33,40 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGLength extends SimpleScriptable {
+ /** The constant {@code SVG_LENGTHTYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_UNKNOWN = 0;
+ /** The constant {@code SVG_LENGTHTYPE_NUMBER}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_NUMBER = 1;
+ /** The constant {@code SVG_LENGTHTYPE_PERCENTAGE}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_PERCENTAGE = 2;
+ /** The constant {@code SVG_LENGTHTYPE_EMS}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_EMS = 3;
+ /** The constant {@code SVG_LENGTHTYPE_EXS}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_EXS = 4;
+ /** The constant {@code SVG_LENGTHTYPE_PX}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_PX = 5;
+ /** The constant {@code SVG_LENGTHTYPE_CM}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_CM = 6;
+ /** The constant {@code SVG_LENGTHTYPE_MM}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_MM = 7;
+ /** The constant {@code SVG_LENGTHTYPE_IN}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_IN = 8;
+ /** The constant {@code SVG_LENGTHTYPE_PT}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_PT = 9;
+ /** The constant {@code SVG_LENGTHTYPE_PC}. */
+ @JsxConstant
+ public static final int SVG_LENGTHTYPE_PC = 10;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLinearGradientElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLinearGradientElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGLinearGradientElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgLinearGradient;
@@ -33,6 +34,19 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGLinearGradientElement extends SVGGradientElement {
+ /** The constant {@code SVG_SPREADMETHOD_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_UNKNOWN = 0;
+ /** The constant {@code SVG_SPREADMETHOD_PAD}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_PAD = 1;
+ /** The constant {@code SVG_SPREADMETHOD_REFLECT}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_REFLECT = 2;
+ /** The constant {@code SVG_SPREADMETHOD_REPEAT}. */
+ @JsxConstant
+ public static final int SVG_SPREADMETHOD_REPEAT = 3;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMarkerElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMarkerElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMarkerElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgMarker;
@@ -33,6 +34,25 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGMarkerElement extends SVGElement {
+ /** The constant {@code SVG_MARKER_ORIENT_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_MARKER_ORIENT_UNKNOWN = 0;
+ /** The constant {@code SVG_MARKERUNITS_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_MARKERUNITS_UNKNOWN = 0;
+ /** The constant {@code SVG_MARKER_ORIENT_AUTO}. */
+ @JsxConstant
+ public static final int SVG_MARKER_ORIENT_AUTO = 1;
+ /** The constant {@code SVG_MARKERUNITS_USERSPACEONUSE}. */
+ @JsxConstant
+ public static final int SVG_MARKERUNITS_USERSPACEONUSE = 1;
+ /** The constant {@code SVG_MARKER_ORIENT_ANGLE}. */
+ @JsxConstant
+ public static final int SVG_MARKER_ORIENT_ANGLE = 2;
+ /** The constant {@code SVG_MARKERUNITS_STROKEWIDTH}. */
+ @JsxConstant
+ public static final int SVG_MARKERUNITS_STROKEWIDTH = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPathSeg.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPathSeg.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPathSeg.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -32,6 +33,67 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGPathSeg extends SimpleScriptable {
+ /** The constant {@code PATHSEG_UNKNOWN}. */
+ @JsxConstant
+ public static final int PATHSEG_UNKNOWN = 0;
+ /** The constant {@code PATHSEG_CLOSEPATH}. */
+ @JsxConstant
+ public static final int PATHSEG_CLOSEPATH = 1;
+ /** The constant {@code PATHSEG_MOVETO_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_MOVETO_ABS = 2;
+ /** The constant {@code PATHSEG_MOVETO_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_MOVETO_REL = 3;
+ /** The constant {@code PATHSEG_LINETO_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_ABS = 4;
+ /** The constant {@code PATHSEG_LINETO_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_REL = 5;
+ /** The constant {@code PATHSEG_CURVETO_CUBIC_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_CUBIC_ABS = 6;
+ /** The constant {@code PATHSEG_CURVETO_CUBIC_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_CUBIC_REL = 7;
+ /** The constant {@code PATHSEG_CURVETO_QUADRATIC_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_QUADRATIC_ABS = 8;
+ /** The constant {@code PATHSEG_CURVETO_QUADRATIC_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_QUADRATIC_REL = 9;
+ /** The constant {@code PATHSEG_ARC_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_ARC_ABS = 10;
+ /** The constant {@code PATHSEG_ARC_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_ARC_REL = 11;
+ /** The constant {@code PATHSEG_LINETO_HORIZONTAL_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_HORIZONTAL_ABS = 12;
+ /** The constant {@code PATHSEG_LINETO_HORIZONTAL_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_HORIZONTAL_REL = 13;
+ /** The constant {@code PATHSEG_LINETO_VERTICAL_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_VERTICAL_ABS = 14;
+ /** The constant {@code PATHSEG_LINETO_VERTICAL_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_LINETO_VERTICAL_REL = 15;
+ /** The constant {@code PATHSEG_CURVETO_CUBIC_SMOOTH_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_CUBIC_SMOOTH_ABS = 16;
+ /** The constant {@code PATHSEG_CURVETO_CUBIC_SMOOTH_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_CUBIC_SMOOTH_REL = 17;
+ /** The constant {@code PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS = 18;
+ /** The constant {@code PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL}. */
+ @JsxConstant
+ public static final int PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL = 19;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPreserveAspectRatio.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPreserveAspectRatio.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPreserveAspectRatio.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -32,6 +33,49 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGPreserveAspectRatio extends SimpleScriptable {
+ /** The constant {@code SVG_MEETORSLICE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_MEETORSLICE_UNKNOWN = 0;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_UNKNOWN = 0;
+ /** The constant {@code SVG_MEETORSLICE_MEET}. */
+ @JsxConstant
+ public static final int SVG_MEETORSLICE_MEET = 1;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_NONE}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_NONE = 1;
+ /** The constant {@code SVG_MEETORSLICE_SLICE}. */
+ @JsxConstant
+ public static final int SVG_MEETORSLICE_SLICE = 2;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMINYMIN}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMINYMIN = 2;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMIDYMIN}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMIDYMIN = 3;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMAXYMIN}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMAXYMIN = 4;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMINYMID}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMINYMID = 5;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMIDYMID}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMIDYMID = 6;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMAXYMID}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMAXYMID = 7;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMINYMAX}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMINYMAX = 8;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMIDYMAX}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMIDYMAX = 9;
+ /** The constant {@code SVG_PRESERVEASPECTRATIO_XMAXYMAX}. */
+ @JsxConstant
+ public static final int SVG_PRESERVEASPECTRATIO_XMAXYMAX = 10;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGRenderingIntent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGRenderingIntent.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGRenderingIntent.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -18,6 +18,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -30,6 +31,25 @@
@JsxClass(browsers = @WebBrowser(CHROME))
public class SVGRenderingIntent extends SimpleScriptable {
+ /** The constant {@code RENDERING_INTENT_UNKNOWN}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_UNKNOWN = 0;
+ /** The constant {@code RENDERING_INTENT_AUTO}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_AUTO = 1;
+ /** The constant {@code RENDERING_INTENT_PERCEPTUAL}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_PERCEPTUAL = 2;
+ /** The constant {@code RENDERING_INTENT_RELATIVE_COLORIMETRIC}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_RELATIVE_COLORIMETRIC = 3;
+ /** The constant {@code RENDERING_INTENT_SATURATION}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_SATURATION = 4;
+ /** The constant {@code RENDERING_INTENT_ABSOLUTE_COLORIMETRIC}. */
+ @JsxConstant
+ public static final int RENDERING_INTENT_ABSOLUTE_COLORIMETRIC = 5;
+
/**
* Creates a new instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGSVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGSVGElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGSVGElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxFunction;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -34,6 +35,16 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGSVGElement extends SVGGraphicsElement {
+ /** The constant {@code SVG_ZOOMANDPAN_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_UNKNOWN = 0;
+ /** The constant {@code SVG_ZOOMANDPAN_DISABLE}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_DISABLE = 1;
+ /** The constant {@code SVG_ZOOMANDPAN_MAGNIFY}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_MAGNIFY = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextContentElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextContentElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextContentElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -31,6 +32,16 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGTextContentElement extends SVGGraphicsElement {
+ /** The constant {@code LENGTHADJUST_UNKNOWN}. */
+ @JsxConstant
+ public static final int LENGTHADJUST_UNKNOWN = 0;
+ /** The constant {@code LENGTHADJUST_SPACING}. */
+ @JsxConstant
+ public static final int LENGTHADJUST_SPACING = 1;
+ /** The constant {@code LENGTHADJUST_SPACINGANDGLYPHS}. */
+ @JsxConstant
+ public static final int LENGTHADJUST_SPACINGANDGLYPHS = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextPathElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextPathElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTextPathElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgTextPath;
@@ -33,6 +34,25 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGTextPathElement extends SVGTextContentElement {
+ /** The constant {@code TEXTPATH_METHODTYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int TEXTPATH_METHODTYPE_UNKNOWN = 0;
+ /** The constant {@code TEXTPATH_SPACINGTYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int TEXTPATH_SPACINGTYPE_UNKNOWN = 0;
+ /** The constant {@code TEXTPATH_METHODTYPE_ALIGN}. */
+ @JsxConstant
+ public static final int TEXTPATH_METHODTYPE_ALIGN = 1;
+ /** The constant {@code TEXTPATH_SPACINGTYPE_AUTO}. */
+ @JsxConstant
+ public static final int TEXTPATH_SPACINGTYPE_AUTO = 1;
+ /** The constant {@code TEXTPATH_METHODTYPE_STRETCH}. */
+ @JsxConstant
+ public static final int TEXTPATH_METHODTYPE_STRETCH = 2;
+ /** The constant {@code TEXTPATH_SPACINGTYPE_EXACT}. */
+ @JsxConstant
+ public static final int TEXTPATH_SPACINGTYPE_EXACT = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTransform.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTransform.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGTransform.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -32,6 +33,28 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGTransform extends SimpleScriptable {
+ /** The constant {@code SVG_TRANSFORM_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_UNKNOWN = 0;
+ /** The constant {@code SVG_TRANSFORM_MATRIX}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_MATRIX = 1;
+ /** The constant {@code SVG_TRANSFORM_TRANSLATE}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_TRANSLATE = 2;
+ /** The constant {@code SVG_TRANSFORM_SCALE}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_SCALE = 3;
+ /** The constant {@code SVG_TRANSFORM_ROTATE}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_ROTATE = 4;
+ /** The constant {@code SVG_TRANSFORM_SKEWX}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_SKEWX = 5;
+ /** The constant {@code SVG_TRANSFORM_SKEWY}. */
+ @JsxConstant
+ public static final int SVG_TRANSFORM_SKEWY = 6;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGUnitTypes.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGUnitTypes.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGUnitTypes.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -32,6 +33,16 @@
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
public class SVGUnitTypes extends SimpleScriptable {
+ /** The constant {@code SVG_UNIT_TYPE_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
+ /** The constant {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
+ @JsxConstant
+ public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
+ /** The constant {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
+ @JsxConstant
+ public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewElement.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewElement.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.svg.SvgView;
@@ -33,6 +34,16 @@
browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(CHROME) })
public class SVGViewElement extends SVGElement {
+ /** The constant {@code SVG_ZOOMANDPAN_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_UNKNOWN = 0;
+ /** The constant {@code SVG_ZOOMANDPAN_DISABLE}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_DISABLE = 1;
+ /** The constant {@code SVG_ZOOMANDPAN_MAGNIFY}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_MAGNIFY = 2;
+
/**
* Creates an instance.
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewSpec.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewSpec.java 2015-06-15 19:39:37 UTC (rev 10725)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGViewSpec.java 2015-06-15 20:38:40 UTC (rev 10726)
@@ -18,6 +18,7 @@
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
@@ -30,6 +31,16 @@
@JsxClass(browsers = @WebBrowser(CHROME))
public class SVGViewSpec extends SimpleScriptable {
+ /** The constant {@code SVG_ZOOMANDPAN_UNKNOWN}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_UNKNOWN = 0;
+ /** The constant {@code SVG_ZOOMANDPAN_DISABLE}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_DISABLE = 1;
+ /** The constant {@code SVG_ZOOMANDPAN_MAGNIFY}. */
+ @JsxConstant
+ public static final int SVG_ZOOMANDPAN_MAGNIFY = 2;
+
/**
* Creates a new instance.
*/
|
|
From: <rb...@us...> - 2015-07-26 15:19:57
|
Revision: 10909
http://sourceforge.net/p/htmlunit/code/10909
Author: rbri
Date: 2015-07-26 15:19:55 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
change some <code> to @code
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/PostponedAction.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/PostponedAction.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/PostponedAction.java 2015-07-26 15:19:36 UTC (rev 10908)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/PostponedAction.java 2015-07-26 15:19:55 UTC (rev 10909)
@@ -39,7 +39,7 @@
/**
* Gets the owning page.
- * @return the page that initiated this action or <code>null</code> if it has already been GCed
+ * @return the page that initiated this action or {@code null} if it has already been GCed
*/
protected Page getOwningPage() {
return owningPageRef_.get();
@@ -53,7 +53,7 @@
/**
* Indicates if the action still needs to be executed.
- * @return <code>true</code> if the action needs to be executed
+ * @return {@code true} if the action needs to be executed
*/
public boolean isStillAlive() {
final Page owningPage = getOwningPage();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java 2015-07-26 15:19:36 UTC (rev 10908)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java 2015-07-26 15:19:55 UTC (rev 10909)
@@ -166,7 +166,7 @@
* @param clazz the class to search on
* @param name the name of the searched method
* @param annotationClass the class of the annotation required
- * @return <code>null</code> if not found
+ * @return {@code null} if not found
*/
static Method getMethod(final Class<? extends SimpleScriptable> clazz,
final String name, final Class<? extends Annotation> annotationClass) {
|
|
From: <mgu...@us...> - 2015-09-16 08:33:41
|
Revision: 11230
http://sourceforge.net/p/htmlunit/code/11230
Author: mguillem
Date: 2015-09-16 08:33:39 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
preparation for JS execution outside a DOM context: introduce HtmlUnitScriptable as base class for script objects NOT bound to DOM node
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/Intl.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitScriptable.java
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitScriptable.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitScriptable.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2002-2015 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript;
+
+import java.lang.reflect.Method;
+
+import net.sourceforge.htmlunit.corejs.javascript.Context;
+import net.sourceforge.htmlunit.corejs.javascript.FunctionObject;
+import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
+import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
+
+/**
+ * Base class for Rhino host objects in HtmlUnit (not bound to a DOM node).
+ *
+ * @author <a href="mailto:mb...@Ga...">Mike Bowler</a>
+ * @author David K. Taylor
+ * @author Marc Guillemot
+ * @author Chris Erskine
+ * @author Daniel Gredler
+ * @author Ahmed Ashour
+ * @author Ronald Brill
+ */
+public class HtmlUnitScriptable extends ScriptableObject {
+ private String className_;
+
+ /**
+ * Returns the JavaScript class name.
+ * @return the JavaScript class name
+ */
+ @Override
+ public String getClassName() {
+ if (className_ != null) {
+ return className_;
+ }
+ if (getPrototype() != null) {
+ return getPrototype().getClassName();
+ }
+ String className = getClass().getSimpleName();
+ if (className.isEmpty()) {
+ // for anonymous class
+ className = getClass().getSuperclass().getSimpleName();
+ }
+ return className;
+ }
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
+ *
+ * Sets the class name.
+ * @param className the class name.
+ */
+ public void setClassName(final String className) {
+ this.className_ = className;
+ }
+
+ /**
+ * {@inheritDoc}
+ * Same as base implementation, but includes all methods inherited from super classes as well.
+ */
+ @Override
+ public void defineProperty(final String propertyName, final Class<?> clazz, int attributes) {
+ final int length = propertyName.length();
+ if (length == 0) {
+ throw new IllegalArgumentException();
+ }
+ final char[] buf = new char[3 + length];
+ propertyName.getChars(0, length, buf, 3);
+ buf[3] = Character.toUpperCase(buf[3]);
+ buf[0] = 'g';
+ buf[1] = 'e';
+ buf[2] = 't';
+ final String getterName = new String(buf);
+ buf[0] = 's';
+ final String setterName = new String(buf);
+
+ final Method[] methods = clazz.getMethods();
+ final Method getter = findMethod(methods, getterName);
+ final Method setter = findMethod(methods, setterName);
+ if (setter == null) {
+ attributes |= ScriptableObject.READONLY;
+ }
+ defineProperty(propertyName, null, getter, setter, attributes);
+ }
+
+ /**
+ * {@inheritDoc}
+ * Same as base implementation, but includes all methods inherited from super classes as well.
+ */
+ @Override
+ public void defineFunctionProperties(final String[] names, final Class<?> clazz, final int attributes) {
+ final Method[] methods = clazz.getMethods();
+ for (final String name : names) {
+ final Method method = findMethod(methods, name);
+ if (method == null) {
+ throw Context.reportRuntimeError("Method \"" + name + "\" not found in \"" + clazz.getName() + '"');
+ }
+ final FunctionObject f = new FunctionObject(name, method, this);
+ defineProperty(name, f, attributes);
+ }
+ }
+
+ /**
+ * Returns the method with the specified name.
+ */
+ private static Method findMethod(final Method[] methods, final String name) {
+ for (Method m : methods) {
+ if (m.getName().equals(name)) {
+ return m;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setParentScope(final Scriptable m) {
+ if (m == this) {
+ throw new IllegalArgumentException("Object can't be its own parentScope");
+ }
+ super.setParentScope(m);
+ }
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitScriptable.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -201,8 +201,8 @@
private void init(final WebWindow webWindow, final Context context) throws Exception {
final WebClient webClient = webWindow.getWebClient();
final BrowserVersion browserVersion = webClient.getBrowserVersion();
- final Map<Class<? extends SimpleScriptable>, Scriptable> prototypes = new HashMap<>();
- final Map<String, Scriptable> prototypesPerJSName = new HashMap<>();
+ final Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> prototypes = new HashMap<>();
+ final Map<String, HtmlUnitScriptable> prototypesPerJSName = new HashMap<>();
final Window window = new Window();
((SimpleScriptable) window).setClassName("Window");
@@ -253,15 +253,15 @@
if (isWindow) {
configureConstantsPropertiesAndFunctions(config, window, browserVersion);
- final ScriptableObject prototype = configureClass(config, window, browserVersion);
+ final HtmlUnitScriptable prototype = configureClass(config, window, browserVersion);
prototypesPerJSName.put(config.getClassName(), prototype);
}
else {
- final ScriptableObject prototype = configureClass(config, window, browserVersion);
+ final HtmlUnitScriptable prototype = configureClass(config, window, browserVersion);
if (config.isJsObject()) {
// Place object with prototype property in Window scope
if (putPrototypeInWindowScope) {
- final SimpleScriptable obj = config.getHostClass().newInstance();
+ final HtmlUnitScriptable obj = config.getHostClass().newInstance();
prototype.defineProperty("__proto__", prototype, ScriptableObject.DONTENUM);
obj.defineProperty("prototype", prototype, ScriptableObject.DONTENUM); // but not setPrototype!
obj.setParentScope(window);
@@ -274,7 +274,7 @@
final Page page = webWindow.getEnclosedPage();
if (page != null && page.isHtmlPage()) {
final DomNode domNode = new HtmlDivision("", (HtmlPage) page, null);
- obj.setDomNode(domNode);
+ ((SimpleScriptable) obj).setDomNode(domNode);
}
}
}
@@ -412,24 +412,8 @@
}
configureConstants(config, function);
-
- for (final Entry<String, Method> staticfunctionInfo : config.getStaticFunctionEntries()) {
- final String functionName = staticfunctionInfo.getKey();
- final Method method = staticfunctionInfo.getValue();
- final FunctionObject staticFunctionObject = new FunctionObject(functionName, method,
- function);
- function.defineProperty(functionName, staticFunctionObject, ScriptableObject.EMPTY);
- }
-
- for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry
- : config.getStaticPropertyEntries()) {
- final String propertyName = propertyEntry.getKey();
- final Method readMethod = propertyEntry.getValue().getReadMethod();
- final Method writeMethod = propertyEntry.getValue().getWriteMethod();
- final int flag = ScriptableObject.EMPTY;
-
- function.defineProperty(propertyName, null, readMethod, writeMethod, flag);
- }
+ configureStaticFunctions(config, function);
+ configureStaticProperties(config, browserVersion, function);
}
else {
if (browserVersion.hasFeature(JS_CONSTRUCTOR)) {
@@ -460,7 +444,7 @@
// once all prototypes have been build, it's possible to configure the chains
final Scriptable objectPrototype = ScriptableObject.getObjectPrototype(window);
- for (final Map.Entry<String, Scriptable> entry : prototypesPerJSName.entrySet()) {
+ for (final Map.Entry<String, HtmlUnitScriptable> entry : prototypesPerJSName.entrySet()) {
final String name = entry.getKey();
final ClassConfiguration config = jsConfig_.getClassConfiguration(name);
Scriptable prototype = entry.getValue();
@@ -630,11 +614,11 @@
* @throws IllegalAccessException if we don't have access to create the new instance
* @return the created prototype
*/
- public static SimpleScriptable configureClass(final ClassConfiguration config, final Scriptable window,
+ public static HtmlUnitScriptable configureClass(final ClassConfiguration config, final Scriptable window,
final BrowserVersion browserVersion)
throws InstantiationException, IllegalAccessException {
- final SimpleScriptable prototype = config.getHostClass().newInstance();
+ final HtmlUnitScriptable prototype = config.getHostClass().newInstance();
prototype.setParentScope(window);
prototype.setClassName(config.getClassName());
@@ -655,20 +639,15 @@
configureConstants(config, scriptable);
// the properties
- for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry : config.getPropertyEntries()) {
- final String propertyName = propertyEntry.getKey();
- final Method readMethod = propertyEntry.getValue().getReadMethod();
- final Method writeMethod = propertyEntry.getValue().getWriteMethod();
- int flag = ScriptableObject.EMPTY;
+ configureProperties(config, browserVersion, scriptable);
- // https://code.google.com/p/chromium/issues/detail?id=492999
- if (browserVersion.isChrome() && "cssFloat".equals(propertyName)) {
- flag = ScriptableObject.DONTENUM;
- }
- scriptable.defineProperty(propertyName, null, readMethod, writeMethod, flag);
- }
+ configureFunctions(config, browserVersion, scriptable);
+ }
- int attributes;
+ private static void configureFunctions(final ClassConfiguration config,
+ final BrowserVersion browserVersion,
+ final ScriptableObject scriptable) {
+ final int attributes;
if (browserVersion.hasFeature(JS_DONT_ENUM_FUNCTIONS)) {
attributes = ScriptableObject.DONTENUM;
}
@@ -704,6 +683,48 @@
}
}
+ private static void configureProperties(final ClassConfiguration config, final BrowserVersion browserVersion,
+ final ScriptableObject scriptable) {
+
+ for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry : config.getPropertyEntries()) {
+ final String propertyName = propertyEntry.getKey();
+ final Method readMethod = propertyEntry.getValue().getReadMethod();
+ final Method writeMethod = propertyEntry.getValue().getWriteMethod();
+ int flag = ScriptableObject.EMPTY;
+
+ // https://code.google.com/p/chromium/issues/detail?id=492999
+ if (browserVersion.isChrome() && "cssFloat".equals(propertyName)) {
+ flag = ScriptableObject.DONTENUM;
+ }
+ scriptable.defineProperty(propertyName, null, readMethod, writeMethod, flag);
+ }
+ }
+
+ private static void configureStaticProperties(final ClassConfiguration config,
+ final BrowserVersion browserVersion,
+ final ScriptableObject scriptable) {
+ for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry
+ : config.getStaticPropertyEntries()) {
+ final String propertyName = propertyEntry.getKey();
+ final Method readMethod = propertyEntry.getValue().getReadMethod();
+ final Method writeMethod = propertyEntry.getValue().getWriteMethod();
+ final int flag = ScriptableObject.EMPTY;
+
+ scriptable.defineProperty(propertyName, null, readMethod, writeMethod, flag);
+ }
+ }
+
+ private static void configureStaticFunctions(final ClassConfiguration config,
+ final ScriptableObject scriptable) {
+ for (final Entry<String, Method> staticfunctionInfo : config.getStaticFunctionEntries()) {
+ final String functionName = staticfunctionInfo.getKey();
+ final Method method = staticfunctionInfo.getValue();
+ final FunctionObject staticFunctionObject = new FunctionObject(functionName, method,
+ scriptable);
+ scriptable.defineProperty(functionName, staticFunctionObject, ScriptableObject.EMPTY);
+ }
+ }
+
/**
* Register WebWindow with the JavaScriptExecutor.
* @param webWindow the WebWindow to be registered.
@@ -756,7 +777,22 @@
*/
public Script compile(final InteractivePage page, final String sourceCode,
final String sourceName, final int startLine) {
+ final Scriptable scope = getScope(page, null);
+ return compile(page, scope, sourceCode, sourceCode, startLine);
+ }
+ /**
+ * Compiles the specified JavaScript code in the context of a given scope.
+ *
+ * @param owningPage the page from which the code started
+ * @param scope the scope in which to execute the javascript code
+ * @param sourceCode the JavaScript code to execute
+ * @param sourceName the name that will be displayed on error conditions
+ * @param startLine the line at which the script source starts
+ * @return the result of executing the specified code
+ */
+ public Script compile(final InteractivePage owningPage, final Scriptable scope, final String sourceCode,
+ final String sourceName, final int startLine) {
WebAssert.notNull("sourceCode", sourceCode);
if (LOG.isTraceEnabled()) {
@@ -764,9 +800,8 @@
LOG.trace("Javascript compile " + sourceName + newline + sourceCode + newline);
}
- final Scriptable scope = getScope(page, null);
final String source = sourceCode;
- final ContextAction action = new HtmlUnitContextAction(scope, page) {
+ final ContextAction action = new HtmlUnitContextAction(scope, owningPage) {
@Override
public Object doRun(final Context cx) {
return cx.compileString(source, sourceName, startLine, null);
@@ -811,7 +846,18 @@
*/
public Object execute(final InteractivePage page, final Script script) {
final Scriptable scope = getScope(page, null);
+ return execute(page, scope, script);
+ }
+ /**
+ * Executes the specified JavaScript code in the given scope.
+ *
+ * @param page the page that started the execution
+ * @param scope the scope in which to execute
+ * @param script the script to execute
+ * @return the result of executing the specified code
+ */
+ public Object execute(final InteractivePage page, final Scriptable scope, final Script script) {
final ContextAction action = new HtmlUnitContextAction(scope, page) {
@Override
public Object doRun(final Context cx) {
@@ -1098,7 +1144,7 @@
* @param c the node class {@link DomNode} or some subclass.
* @return {@code null} if none found
*/
- public Class<? extends SimpleScriptable> getJavaScriptClass(final Class<?> c) {
+ public Class<? extends HtmlUnitScriptable> getJavaScriptClass(final Class<?> c) {
return jsConfig_.getDomJavaScriptMapping().get(c);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -22,6 +22,11 @@
import java.lang.reflect.Method;
import java.util.Stack;
+import net.sourceforge.htmlunit.corejs.javascript.Context;
+import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
+import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
+import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
+
import org.apache.commons.collections.Transformer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,12 +45,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLUnknownElement;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.FunctionObject;
-import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
-import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
-import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
-
/**
* Base class for Rhino host objects in HtmlUnit.
*
@@ -57,13 +56,12 @@
* @author Ahmed Ashour
* @author Ronald Brill
*/
-public class SimpleScriptable extends ScriptableObject implements Cloneable {
+public class SimpleScriptable extends HtmlUnitScriptable implements Cloneable {
private static final Log LOG = LogFactory.getLog(SimpleScriptable.class);
private DomNode domNode_;
private boolean caseSensitive_ = true;
- private String className_;
/**
* Gets a named property from the object.
@@ -111,36 +109,6 @@
}
/**
- * Returns the JavaScript class name.
- * @return the JavaScript class name
- */
- @Override
- public String getClassName() {
- if (className_ != null) {
- return className_;
- }
- if (getPrototype() != null) {
- return getPrototype().getClassName();
- }
- String className = getClass().getSimpleName();
- if (className.isEmpty()) {
- // for anonymous class
- className = getClass().getSuperclass().getSimpleName();
- }
- return className;
- }
-
- /**
- * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
- *
- * Sets the class name.
- * @param className the class name.
- */
- public void setClassName(final String className) {
- this.className_ = className;
- }
-
- /**
* Returns the DOM node that corresponds to this JavaScript object or throw
* an exception if one cannot be found.
* @return the DOM node
@@ -233,8 +201,9 @@
}
}
if (javaScriptClass == null) {
+ final JavaScriptEngine javaScriptEngine = getWindow().getWebWindow().getWebClient().getJavaScriptEngine();
for (Class<?> c = domNode.getClass(); javaScriptClass == null && c != null; c = c.getSuperclass()) {
- javaScriptClass = getWindow().getWebWindow().getWebClient().getJavaScriptEngine().getJavaScriptClass(c);
+ javaScriptClass = (Class<? extends SimpleScriptable>) javaScriptEngine.getJavaScriptClass(c);
}
}
@@ -364,64 +333,6 @@
}
/**
- * {@inheritDoc}
- * Same as base implementation, but includes all methods inherited from super classes as well.
- */
- @Override
- public void defineProperty(final String propertyName, final Class<?> clazz, int attributes) {
- final int length = propertyName.length();
- if (length == 0) {
- throw new IllegalArgumentException();
- }
- final char[] buf = new char[3 + length];
- propertyName.getChars(0, length, buf, 3);
- buf[3] = Character.toUpperCase(buf[3]);
- buf[0] = 'g';
- buf[1] = 'e';
- buf[2] = 't';
- final String getterName = new String(buf);
- buf[0] = 's';
- final String setterName = new String(buf);
-
- final Method[] methods = clazz.getMethods();
- final Method getter = findMethod(methods, getterName);
- final Method setter = findMethod(methods, setterName);
- if (setter == null) {
- attributes |= ScriptableObject.READONLY;
- }
- defineProperty(propertyName, null, getter, setter, attributes);
- }
-
- /**
- * {@inheritDoc}
- * Same as base implementation, but includes all methods inherited from super classes as well.
- */
- @Override
- public void defineFunctionProperties(final String[] names, final Class<?> clazz, final int attributes) {
- final Method[] methods = clazz.getMethods();
- for (final String name : names) {
- final Method method = findMethod(methods, name);
- if (method == null) {
- throw Context.reportRuntimeError("Method \"" + name + "\" not found in \"" + clazz.getName() + '"');
- }
- final FunctionObject f = new FunctionObject(name, method, this);
- defineProperty(name, f, attributes);
- }
- }
-
- /**
- * Returns the method with the specified name.
- */
- private static Method findMethod(final Method[] methods, final String name) {
- for (Method m : methods) {
- if (m.getName().equals(name)) {
- return m;
- }
- }
- return null;
- }
-
- /**
* Gets the browser version currently used.
* @return the browser version
*/
@@ -524,16 +435,4 @@
}
return true;
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setParentScope(final Scriptable m) {
- if (m == this) {
- throw new IllegalArgumentException("Object can't be its own parentScope");
- }
- super.setParentScope(m);
- }
-
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -29,6 +29,7 @@
import org.apache.commons.logging.LogFactory;
import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
/**
@@ -46,7 +47,7 @@
private static final Map<String, String> CLASS_NAME_MAP_ = new HashMap<>();
- private Map<Class<?>, Class<? extends SimpleScriptable>> domJavaScriptMap_;
+ private Map<Class<?>, Class<? extends HtmlUnitScriptable>> domJavaScriptMap_;
private final Map<String, ClassConfiguration> configuration_;
@@ -90,7 +91,7 @@
* @param browser the browser version
* @return the class configuration
*/
- public static ClassConfiguration getClassConfiguration(final Class<? extends SimpleScriptable> klass,
+ public static ClassConfiguration getClassConfiguration(final Class<? extends HtmlUnitScriptable> klass,
final BrowserVersion browser) {
if (browser != null) {
final String expectedBrowserName;
@@ -307,12 +308,12 @@
* are the JavaScript class names (e.g. "HTMLAnchorElement").
* @return the mappings
*/
- public Map<Class<?>, Class<? extends SimpleScriptable>> getDomJavaScriptMapping() {
+ public Map<Class<?>, Class<? extends HtmlUnitScriptable>> getDomJavaScriptMapping() {
if (domJavaScriptMap_ != null) {
return domJavaScriptMap_;
}
- final Map<Class<?>, Class<? extends SimpleScriptable>> map = new HashMap<>(configuration_.size());
+ final Map<Class<?>, Class<? extends HtmlUnitScriptable>> map = new HashMap<>(configuration_.size());
final boolean debug = LOG.isDebugEnabled();
for (final String hostClassName : configuration_.keySet()) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -23,6 +23,7 @@
import java.util.Map.Entry;
import java.util.Set;
+import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
/**
@@ -40,7 +41,7 @@
private Map<String, Method> staticFunctionMap_ = new HashMap<>();
private List<String> constants_ = new ArrayList<>();
private String extendedClassName_;
- private final Class<? extends SimpleScriptable> hostClass_;
+ private final Class<? extends HtmlUnitScriptable> hostClass_;
/**
* The constructor method in the {@link #hostClass_}
@@ -60,7 +61,7 @@
* @param definedInStandardsMode should be defined in only Standards Mode
* @param className the class name, can be null
*/
- public ClassConfiguration(final Class<? extends SimpleScriptable> hostClass, final Class<?>[] domClasses,
+ public ClassConfiguration(final Class<? extends HtmlUnitScriptable> hostClass, final Class<?>[] domClasses,
final boolean jsObject, final boolean definedInStandardsMode, final String className) {
final Class<?> superClass = hostClass.getSuperclass();
if (superClass != SimpleScriptable.class) {
@@ -189,7 +190,7 @@
* Gets the class of the JavaScript host object.
* @return the class of the JavaScript host object
*/
- public Class<? extends SimpleScriptable> getHostClass() {
+ public Class<? extends HtmlUnitScriptable> getHostClass() {
return hostClass_;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -106,6 +106,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlSelect;
import com.gargoylesoftware.htmlunit.html.HtmlStyle;
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
+import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
import com.gargoylesoftware.htmlunit.javascript.PostponedAction;
import com.gargoylesoftware.htmlunit.javascript.ScriptableWithFallbackGetter;
@@ -199,8 +200,8 @@
private Event currentEvent_;
private String status_ = "";
private HTMLCollection frames_; // has to be a member to have equality (==) working
- private Map<Class<? extends SimpleScriptable>, Scriptable> prototypes_ = new HashMap<>();
- private Map<String, Scriptable> prototypesPerJSName_ = new HashMap<>();
+ private Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> prototypes_ = new HashMap<>();
+ private Map<String, HtmlUnitScriptable> prototypesPerJSName_ = new HashMap<>();
private Object controllers_;
private Object opener_;
private Object top_ = NOT_FOUND; // top can be set from JS to any value!
@@ -257,8 +258,8 @@
* @param map a Map of ({@link Class}, {@link Scriptable})
* @param prototypesPerJSName map of {@link String} and {@link Scriptable}
*/
- public void setPrototypes(final Map<Class<? extends SimpleScriptable>, Scriptable> map,
- final Map<String, Scriptable> prototypesPerJSName) {
+ public void setPrototypes(final Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> map,
+ final Map<String, HtmlUnitScriptable> prototypesPerJSName) {
prototypes_ = map;
prototypesPerJSName_ = prototypesPerJSName;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/Intl.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/Intl.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/Intl.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_INTL_V8_BREAK_ITERATOR;
import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
import com.gargoylesoftware.htmlunit.javascript.RecursiveFunctionObject;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -50,7 +51,7 @@
private void define(final Class<? extends SimpleScriptable> c, final BrowserVersion browserVersion) {
try {
final ClassConfiguration config = AbstractJavaScriptConfiguration.getClassConfiguration(c, browserVersion);
- final SimpleScriptable prototype = JavaScriptEngine.configureClass(config, this, browserVersion);
+ final HtmlUnitScriptable prototype = JavaScriptEngine.configureClass(config, this, browserVersion);
final FunctionObject functionObject =
new RecursiveFunctionObject(c.getSimpleName(), config.getJsConstructor(), this);
if (c == V8BreakIterator.class) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java 2015-09-16 06:49:44 UTC (rev 11229)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java 2015-09-16 08:33:39 UTC (rev 11230)
@@ -39,6 +39,7 @@
import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -209,10 +210,10 @@
// TODO: cleanup, getScriptObject() should be used!!!
if (domNode instanceof DomElement && !(domNode instanceof HtmlElement)) {
if (domNode instanceof SvgElement) {
- final Class<? extends SimpleScriptable> javaScriptClass = getWindow().getWebWindow().getWebClient()
+ final Class<? extends HtmlUnitScriptable> javaScriptClass = getWindow().getWebWindow().getWebClient()
.getJavaScriptEngine().getJavaScriptClass(domNode.getClass());
try {
- scriptable = javaScriptClass.newInstance();
+ scriptable = (SimpleScriptable) javaScriptClass.newInstance();
}
catch (final Exception e) {
throw Context.throwAsScriptRuntimeEx(e);
|
|
From: <rb...@us...> - 2015-11-05 21:23:56
|
Revision: 11512
http://sourceforge.net/p/htmlunit/code/11512
Author: rbri
Date: 2015-11-05 21:23:54 +0000 (Thu, 05 Nov 2015)
Log Message:
-----------
perf: next optimization - do reflection call only once not on every init;
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-11-05 19:14:24 UTC (rev 11511)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-11-05 21:23:54 UTC (rev 11512)
@@ -59,6 +59,7 @@
import com.gargoylesoftware.htmlunit.javascript.background.BackgroundJavaScriptFactory;
import com.gargoylesoftware.htmlunit.javascript.background.JavaScriptExecutor;
import com.gargoylesoftware.htmlunit.javascript.configuration.ClassConfiguration;
+import com.gargoylesoftware.htmlunit.javascript.configuration.ClassConfiguration.ConstantInfo;
import com.gargoylesoftware.htmlunit.javascript.configuration.JavaScriptConfiguration;
import com.gargoylesoftware.htmlunit.javascript.host.ActiveXObject;
import com.gargoylesoftware.htmlunit.javascript.host.DateCustom;
@@ -277,7 +278,7 @@
final Member jsConstructor = config.getJsConstructor();
final String jsClassName = config.getClassName();
Scriptable prototype = prototypesPerJSName.get(jsClassName);
- final String hostClassSimpleName = config.getHostClass().getSimpleName();
+ final String hostClassSimpleName = config.getHostClassSimpleName();
if ("Image".equals(hostClassSimpleName)
&& browserVersion.hasFeature(JS_IMAGE_PROTOTYPE_SAME_AS_HTML_IMAGE)) {
prototype = prototypesPerJSName.get("HTMLImageElement");
@@ -622,13 +623,8 @@
*/
private static void configureConstantsPropertiesAndFunctions(final ClassConfiguration config,
final ScriptableObject scriptable, final BrowserVersion browserVersion) {
-
- // the constants
configureConstants(config, scriptable);
-
- // the properties
- configureProperties(config, browserVersion, scriptable);
-
+ configureProperties(config, scriptable);
configureFunctions(config, browserVersion, scriptable);
}
@@ -651,28 +647,13 @@
}
}
- private static void configureConstants(final ClassConfiguration config,
- final ScriptableObject scriptable) {
- final Class<?> linkedClass = config.getHostClass();
- for (final String constant : config.getConstants()) {
- try {
- final Object value = linkedClass.getField(constant).get(null);
- int flag = ScriptableObject.READONLY | ScriptableObject.PERMANENT;
- // https://code.google.com/p/chromium/issues/detail?id=500633
- if (config.getClassName().endsWith("Array")) {
- flag |= ScriptableObject.DONTENUM;
- }
- scriptable.defineProperty(constant, value, flag);
- }
- catch (final Exception e) {
- throw Context.reportRuntimeError("Cannot get field '" + constant + "' for type: "
- + config.getHostClass().getName());
- }
+ private static void configureConstants(final ClassConfiguration config, final ScriptableObject scriptable) {
+ for (final ConstantInfo constantInfo : config.getConstants()) {
+ scriptable.defineProperty(constantInfo.getName(), constantInfo.getValue(), constantInfo.getFlag());
}
}
- private static void configureProperties(final ClassConfiguration config, final BrowserVersion browserVersion,
- final ScriptableObject scriptable) {
+ private static void configureProperties(final ClassConfiguration config, final ScriptableObject scriptable) {
for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry : config.getPropertyEntries()) {
final String propertyName = propertyEntry.getKey();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-11-05 19:14:24 UTC (rev 11511)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/ClassConfiguration.java 2015-11-05 21:23:54 UTC (rev 11512)
@@ -23,6 +23,9 @@
import java.util.Map.Entry;
import java.util.Set;
+import net.sourceforge.htmlunit.corejs.javascript.Context;
+import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
+
import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -39,9 +42,10 @@
private Map<String, Method> functionMap_ = new HashMap<>();
private Map<String, PropertyInfo> staticPropertyMap_ = new HashMap<>();
private Map<String, Method> staticFunctionMap_ = new HashMap<>();
- private List<String> constants_ = new ArrayList<>();
+ private List<ConstantInfo> constants_ = new ArrayList<>();
private String extendedClassName_;
private final Class<? extends HtmlUnitScriptable> hostClass_;
+ private final String hostClassSimpleName_;
/**
* The constructor method in the {@link #hostClass_}
@@ -71,6 +75,7 @@
extendedClassName_ = "";
}
hostClass_ = hostClass;
+ hostClassSimpleName_ = hostClass_.getSimpleName();
jsObject_ = jsObject;
definedInStandardsMode_ = definedInStandardsMode;
domClasses_ = domClasses;
@@ -117,7 +122,19 @@
* @param name - Name of the configuration
*/
public void addConstant(final String name) {
- constants_.add(name);
+ try {
+ final Object value = getHostClass().getField(name).get(null);
+ int flag = ScriptableObject.READONLY | ScriptableObject.PERMANENT;
+ // https://code.google.com/p/chromium/issues/detail?id=500633
+ if (getClassName().endsWith("Array")) {
+ flag |= ScriptableObject.DONTENUM;
+ }
+ constants_.add(new ConstantInfo(name, value, flag));
+ }
+ catch (final Exception e) {
+ throw Context.reportRuntimeError("Cannot get field '" + name + "' for type: "
+ + getHostClass().getName());
+ }
}
/**
@@ -164,7 +181,7 @@
* Returns the constant list.
* @return a list
*/
- public List<String> getConstants() {
+ public List<ConstantInfo> getConstants() {
return constants_;
}
@@ -200,6 +217,13 @@
}
/**
+ * @return the hostClassSimpleName
+ */
+ public String getHostClassSimpleName() {
+ return hostClassSimpleName_;
+ }
+
+ /**
* Gets the JavaScript constructor method in {@link #getHostClass()}.
* @return the JavaScript constructor method in {@link #getHostClass()}
*/
@@ -244,8 +268,8 @@
* methods that implement the get and set functions.
*/
public static class PropertyInfo {
- private Method readMethod_;
- private Method writeMethod_;
+ private final Method readMethod_;
+ private final Method writeMethod_;
/**
* Constructor.
@@ -272,4 +296,47 @@
return writeMethod_;
}
}
+
+ /**
+ * Class used to contain the constant information name, value and flag.
+ */
+ public static class ConstantInfo {
+ private final String name_;
+ private final Object value_;
+ private final int flag_;
+
+ /**
+ * Constructor.
+ *
+ * @param name the name
+ * @param value the value
+ * @param flag the flag
+ */
+ public ConstantInfo(final String name, final Object value, final int flag) {
+ name_ = name;
+ value_ = value;
+ flag_ = flag;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name_;
+ }
+
+ /**
+ * @return the value
+ */
+ public Object getValue() {
+ return value_;
+ }
+
+ /**
+ * @return the flag
+ */
+ public int getFlag() {
+ return flag_;
+ }
+ }
}
|
|
From: <rb...@us...> - 2015-12-20 17:39:47
|
Revision: 11644
http://sourceforge.net/p/htmlunit/code/11644
Author: rbri
Date: 2015-12-20 17:39:45 +0000 (Sun, 20 Dec 2015)
Log Message:
-----------
remove IE8 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Comment.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/StaticNodeList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Text.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MutationEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/UIEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/DataTransfer.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/HTMLAppletElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.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/HTMLButtonElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDDElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDTElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.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/HTMLInputElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -448,7 +448,7 @@
HTMLStyleElement.class, HTMLTableCaptionElement.class, HTMLTableCellElement.class, HTMLTableColElement.class,
HTMLTableComponent.class, HTMLTableDataCellElement.class, HTMLTableElement.class,
HTMLTableHeaderCellElement.class, HTMLTableRowElement.class, HTMLTableSectionElement.class,
- HTMLTemplateElement.class, HTMLTextAreaElement.class, HTMLTextElement.class, HTMLTimeElement.class,
+ HTMLTemplateElement.class, HTMLTextAreaElement.class, HTMLTimeElement.class,
HTMLTitleElement.class, HTMLTrackElement.class, HTMLUListElement.class, HTMLUnknownElement.class,
HTMLVideoElement.class,
IDBCursor.class, IDBCursorWithValue.class, IDBDatabase.class, IDBFactory.class, IDBIndex.class,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleList.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -43,8 +43,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class CSSRuleList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -94,8 +94,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class CSSStyleDeclaration extends SimpleScriptable implements ScriptableWithFallbackGetter {
/** CSS important property constant. */
@@ -1050,46 +1049,6 @@
}
/**
- * Gets the object's behavior (IE only).
- * @return the object's behavior
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getBehavior() {
- return getStyleAttribute(BEHAVIOR);
- }
-
- /**
- * Sets the object's behavior (IE only).
- * @param behavior the new behavior
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setBehavior(final String behavior) {
- setStyleAttribute(BEHAVIOR, behavior);
-
- // many methods/properties need to be moved from HTMLElement to Element
- // is it the case for behavior related methods? Assuming not in a first time...
- if (!(jsElement_ instanceof HTMLElement)) {
- throw new RuntimeException("Bug! behavior can be set for Element too!!!");
- }
-
- final HTMLElement htmlElement = (HTMLElement) jsElement_;
- htmlElement.removeBehavior(HTMLElement.BEHAVIOR_ID_CLIENT_CAPS);
- htmlElement.removeBehavior(HTMLElement.BEHAVIOR_ID_HOMEPAGE);
- htmlElement.removeBehavior(HTMLElement.BEHAVIOR_ID_DOWNLOAD);
- if (!behavior.isEmpty()) {
- try {
- final Object[] url = URL_FORMAT.parse(behavior);
- if (url.length > 0) {
- htmlElement.addBehavior((String) url[0]);
- }
- }
- catch (final ParseException e) {
- LOG.warn("Invalid behavior: '" + behavior + "'.");
- }
- }
- }
-
- /**
* Gets the {@code border} style attribute.
* @return the style attribute
*/
@@ -5426,31 +5385,6 @@
}
/**
- * Sets an expression for the specified Style.
- *
- * @param propertyName Specifies the name of the property to which expression is added
- * @param expression specifies any valid script statement without quotations or semicolons;
- * this string can include references to other properties on the current page.
- * Array references are not allowed on object properties included in this script.
- * @param language specified the language used
- */
- @JsxFunction(@WebBrowser(value = IE, maxVersion = 8))
- public void setExpression(final String propertyName, final String expression, final String language) {
- // Empty.
- }
-
- /**
- * Removes the expression from the specified property.
- *
- * @param propertyName the name of the property from which to remove an expression
- * @return true if the expression was successfully removed
- */
- @JsxFunction(@WebBrowser(value = IE, maxVersion = 8))
- public boolean removeExpression(final String propertyName) {
- return true;
- }
-
- /**
* Returns the value of the specified attribute, or an empty string if it does not exist.
* This method exists only in IE.
*
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRule.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -42,8 +42,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class CSSStyleRule extends CSSRule {
private static final Pattern SELECTOR_PARTS_PATTERN = Pattern.compile("[\\.#]?[a-zA-Z]+");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -133,8 +133,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class CSSStyleSheet extends StyleSheet {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetList.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -62,8 +62,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class StyleSheetList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -50,9 +50,7 @@
@JsxClasses({
@JsxClass(domClass = DomAttr.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = DomAttr.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class Attr extends Node {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -39,9 +39,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class CharacterData extends Node {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Comment.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Comment.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Comment.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -25,7 +25,6 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxFunction;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
/**
@@ -42,9 +41,7 @@
@JsxClasses({
@JsxClass(domClass = DomComment.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class Comment extends CharacterData {
@@ -56,33 +53,6 @@
}
/**
- * Returns the element ID.
- * @return the ID of this element
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getId() {
- return "";
- }
-
- /**
- * Returns the class defined for this element.
- * @return the class name
- */
- @JsxGetter(value = @WebBrowser(value = IE, maxVersion = 8), propertyName = "className")
- public Object getClassName_js() {
- return "";
- }
-
- /**
- * Returns the tag name of this element.
- * @return the tag name
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public Object getTagName() {
- return "!";
- }
-
- /**
* Returns the text of this element.
* @return the text
*/
@@ -92,15 +62,6 @@
}
/**
- * Returns the document of this element.
- * @return the document
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public Object getDocument() {
- return getWindow().getDocument_js();
- }
-
- /**
* Gets the attribute node for the specified attribute.
* @param attributeName the name of the attribute to retrieve
* @return the attribute node for the specified attribute
@@ -122,22 +83,4 @@
public Object getAttribute(final String attributeName, final Integer flags) {
return null;
}
-
- /**
- * Gets the innerText attribute.
- * @return the innerText
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getInnerText() {
- return "";
- }
-
- /**
- * Currently does nothing.
- * @param value the new value for the contents of this node
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setInnerText(final String value) {
- // nothing
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementation.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -83,8 +83,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class DOMImplementation extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -90,9 +90,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class Document extends EventNode {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -26,14 +26,12 @@
import org.w3c.css.sac.CSSException;
-import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.DomDocumentFragment;
import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClasses;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxFunction;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDocument;
@@ -49,9 +47,7 @@
@JsxClasses({
@JsxClass(domClass = DomDocumentFragment.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- domClass = DomDocumentFragment.class, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class DocumentFragment extends Node {
@@ -88,17 +84,6 @@
}
/**
- * Create a new HTML element with the given tag name.
- *
- * @param tagName the tag name
- * @return the new HTML element, or NOT_FOUND if the tag is not supported
- */
- @JsxFunction(@WebBrowser(value = IE, maxVersion = 8))
- public Object createElement(final String tagName) {
- return getDocument().createElement(tagName);
- }
-
- /**
* Returns HTML document.
* @return HTML document
*/
@@ -179,15 +164,6 @@
}
/**
- * Returns the value of the {@code URL} property.
- * @return the value of the {@code URL} property
- */
- @JsxGetter(value = @WebBrowser(value = IE, maxVersion = 8), propertyName = "URL")
- public String getURL() {
- return WebClient.ABOUT_BLANK;
- }
-
- /**
* {@inheritDoc}
*/
@Override
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 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -70,9 +70,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) })
+ @WebBrowser(EDGE) })
})
public class Node extends EventTarget {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -48,8 +48,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class Selection extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/StaticNodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/StaticNodeList.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/StaticNodeList.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -37,8 +37,7 @@
* @author Ahmed Ashour
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
})
public class StaticNodeList extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Text.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Text.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Text.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -44,9 +44,7 @@
@JsxClasses({
@JsxClass(domClass = DomText.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = DomText.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class Text extends CharacterData {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/TextRange.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -46,8 +46,7 @@
* @author David Gileadi
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(value = IE, minVersion = 11) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(browsers = { @WebBrowser(value = IE, minVersion = 11) })
})
public class TextRange extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEvent.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/KeyboardEvent.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -43,9 +43,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class KeyboardEvent extends UIEvent {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEvent.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEvent.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -41,9 +41,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class MessageEvent extends Event {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MutationEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MutationEvent.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MutationEvent.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -35,9 +35,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class MutationEvent extends Event {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/UIEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/UIEvent.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/UIEvent.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -39,9 +39,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class UIEvent extends Event {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/DataTransfer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/DataTransfer.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/DataTransfer.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -32,9 +32,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = true,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class DataTransfer extends SimpleScriptable {
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 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -66,9 +66,7 @@
*/
@JsxClasses({
@JsxClass(domClass = HtmlAnchor.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
- @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, domClass = HtmlAnchor.class,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) })
+ @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
})
public class HTMLAnchorElement extends HTMLElement {
@@ -820,58 +818,4 @@
public void setUrn(final String urn) {
throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
}
-
- /**
- * Returns the {@code dataFld} attribute.
- * @return the {@code dataFld} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFld() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFld} attribute.
- * @param dataFld {@code dataFld} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFld(final String dataFld) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataFormatAs} attribute.
- * @return the {@code dataFormatAs} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFormatAs() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFormatAs} attribute.
- * @param dataFormatAs {@code dataFormatAs} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFormatAs(final String dataFormatAs) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataSrc} attribute.
- * @return the {@code dataSrc} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataSrc() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataSrc} attribute.
- * @param dataSrc {@code dataSrc} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataSrc(final String dataSrc) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -47,9 +47,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlApplet.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, isDefinedInStandardsMode = false, domClass = HtmlApplet.class,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLAppletElement extends HTMLElement {
@@ -171,60 +169,6 @@
}
/**
- * Returns the {@code dataFld} attribute.
- * @return the {@code dataFld} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFld() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFld} attribute.
- * @param dataFld {@code dataFld} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFld(final String dataFld) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataFormatAs} attribute.
- * @return the {@code dataFormatAs} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFormatAs() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFormatAs} attribute.
- * @param dataFormatAs {@code dataFormatAs} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFormatAs(final String dataFormatAs) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataSrc} attribute.
- * @return the {@code dataSrc} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataSrc() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataSrc} attribute.
- * @param dataSrc {@code dataSrc} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataSrc(final String dataSrc) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
* Gets the {@code classid} attribute.
* @return the {@code classid} attribute
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -41,9 +41,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlArea.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, domClass = HtmlArea.class,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLAreaElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -41,9 +41,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlBreak.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlBreak.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLBRElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -37,9 +37,7 @@
*/
@JsxClasses({
@JsxClass(domClass = HtmlBase.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
- @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, domClass = HtmlBase.class,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) })
+ @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
})
public class HTMLBaseElement extends HTMLElement {
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 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -42,9 +42,7 @@
*/
@JsxClasses({
@JsxClass(domClass = HtmlBody.class, browsers = { @WebBrowser(CHROME), @WebBrowser(FF),
- @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, domClass = HtmlBody.class,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) })
+ @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
})
public class HTMLBodyElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -21,8 +21,6 @@
import java.util.Locale;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-
import com.gargoylesoftware.htmlunit.html.HtmlButton;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClasses;
@@ -43,9 +41,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlButton.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlButton.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLButtonElement extends FormField {
@@ -88,58 +84,4 @@
}
return "submit";
}
-
- /**
- * Returns the {@code dataFld} attribute.
- * @return the {@code dataFld} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFld() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFld} attribute.
- * @param dataFld {@code dataFld} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFld(final String dataFld) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataFormatAs} attribute.
- * @return the {@code dataFormatAs} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFormatAs() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFormatAs} attribute.
- * @param dataFormatAs {@code dataFormatAs} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFormatAs(final String dataFormatAs) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataSrc} attribute.
- * @return the {@code dataSrc} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataSrc() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataSrc} attribute.
- * @param dataSrc {@code dataSrc} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataSrc(final String dataSrc) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollection.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -62,8 +62,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLCollection extends AbstractList {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDDElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDDElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDDElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -28,9 +28,7 @@
* @author Ahmed Ashour
*/
@JsxClasses({
- @JsxClass(domClass = HtmlDefinitionDescription.class, browsers = @WebBrowser(value = IE, minVersion = 11)),
- @JsxClass(domClass = HtmlDefinitionDescription.class, isJSObject = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(domClass = HtmlDefinitionDescription.class, browsers = @WebBrowser(value = IE, minVersion = 11))
})
public class HTMLDDElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -33,9 +33,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlDefinitionList.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlDefinitionList.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLDListElement extends HTMLListElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDTElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDTElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDTElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -28,9 +28,7 @@
* @author Ahmed Ashour
*/
@JsxClasses({
- @JsxClass(domClass = HtmlDefinitionTerm.class, browsers = @WebBrowser(value = IE, minVersion = 11)),
- @JsxClass(domClass = HtmlDefinitionTerm.class, isJSObject = false,
- browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @JsxClass(domClass = HtmlDefinitionTerm.class, browsers = @WebBrowser(value = IE, minVersion = 11))
})
public class HTMLDTElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -28,8 +28,6 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-
/**
* The JavaScript object {@code HTMLDivElement}.
*
@@ -41,8 +39,6 @@
@JsxClass(domClass = HtmlDivision.class,
browsers = { @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
@WebBrowser(EDGE) }),
- @JsxClass(isJSObject = false, domClass = HtmlDivision.class,
- browsers = { @WebBrowser(value = IE, maxVersion = 8) }),
@JsxClass(domClass = HtmlMarquee.class, browsers = @WebBrowser(FF))
})
public class HTMLDivElement extends HTMLElement {
@@ -71,58 +67,4 @@
public void setAlign(final String align) {
setAlign(align, false);
}
-
- /**
- * Returns the {@code dataFld} attribute.
- * @return the {@code dataFld} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFld() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFld} attribute.
- * @param dataFld {@code dataFld} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFld(final String dataFld) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataFormatAs} attribute.
- * @return the {@code dataFormatAs} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataFormatAs() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataFormatAs} attribute.
- * @param dataFormatAs {@code dataFormatAs} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataFormatAs(final String dataFormatAs) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Returns the {@code dataSrc} attribute.
- * @return the {@code dataSrc} attribute
- */
- @JsxGetter(@WebBrowser(value = IE, maxVersion = 8))
- public String getDataSrc() {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
-
- /**
- * Sets the {@code dataSrc} attribute.
- * @param dataSrc {@code dataSrc} attribute
- */
- @JsxSetter(@WebBrowser(value = IE, maxVersion = 8))
- public void setDataSrc(final String dataSrc) {
- throw Context.throwAsScriptRuntimeEx(new UnsupportedOperationException());
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -36,9 +36,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlEmbed.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlEmbed.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLEmbedElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -35,9 +35,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlFieldSet.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlFieldSet.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLFieldSetElement extends FormChild {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -38,9 +38,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlFont.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlFont.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLFontElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -83,9 +83,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlForm.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlForm.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLFormElement extends HTMLElement implements Function {
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 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -39,9 +39,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlFrameSet.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlFrameSet.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLFrameSetElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -64,9 +64,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlInput.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlInput.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLInputElement extends FormField {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -37,9 +37,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlParagraph.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlParagraph.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLParagraphElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -34,9 +34,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlParameter.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlParameter.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLParamElement extends HTMLElement {
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 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -44,9 +44,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlStyle.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
- @WebBrowser(EDGE) }),
- @JsxClass(domClass = HtmlStyle.class,
- isJSObject = false, browsers = @WebBrowser(value = IE, maxVersion = 8))
+ @WebBrowser(EDGE) })
})
public class HTMLStyleElement extends HTMLElement {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java 2015-12-20 16:48:38 UTC (rev 11643)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java 2015-12-20 17:39:45 UTC (rev 11644)
@@ -39,9 +39,7 @@
@JsxClasses({
@JsxClass(domClass = HtmlCaption.class,
browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, min...
[truncated message content] |
|
From: <rb...@us...> - 2015-12-29 17:23:39
|
Revision: 11678
http://sourceforge.net/p/htmlunit/code/11678
Author: rbri
Date: 2015-12-29 17:23:36 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
more cleanup after IE8 removal
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRectList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Map.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageChannel.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeType.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeArray.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Plugin.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/PluginArray.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Set.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/URL.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -44,7 +44,7 @@
* @see <a href="http://msdn2.microsoft.com/en-us/library/ms763824.aspx">IXMLDOMNamedNodeMap</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(IE),
@WebBrowser(value = FF, minVersion = 38), @WebBrowser(EDGE) }),
@JsxClass(isJSObject = false, isDefinedInStandardsMode = false,
browsers = @WebBrowser(value = FF, maxVersion = 31))
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -47,7 +47,7 @@
* @see <a href="https://developer.mozilla.org/en/nsIDOMOfflineResourceList">Mozilla Documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) }),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(IE), @WebBrowser(EDGE) }),
@JsxClass(className = "OfflineResourceList", browsers = @WebBrowser(FF))
})
public class ApplicationCache extends EventTarget {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRect.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -35,7 +35,7 @@
*/
@JsxClasses({
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, maxVersion = 24),
- @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) }),
+ @WebBrowser(IE), @WebBrowser(EDGE) }),
@JsxClass(className = "DOMRect",
browsers = { @WebBrowser(FF) })
})
@@ -144,7 +144,7 @@
* Returns the {@code width} property.
* @return the {@code width} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getWidth() {
return getRight() - getLeft();
}
@@ -153,7 +153,7 @@
* Returns the {@code height} property.
* @return the {@code height} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getHeight() {
return getBottom() - getTop();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRectList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRectList.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ClientRectList.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -30,7 +30,7 @@
* @author Ahmed Ashour
*/
@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = FF, maxVersion = 24),
- @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
+ @WebBrowser(IE), @WebBrowser(EDGE) })
public class ClientRectList extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -52,7 +52,7 @@
*/
@JsxClasses({
@JsxClass(isJSObject = false, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) }),
- @JsxClass(browsers = { @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
+ @JsxClass(browsers = { @WebBrowser(IE), @WebBrowser(EDGE) })
})
public class Console extends SimpleScriptable {
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 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -59,7 +59,7 @@
*/
@JsxClasses({
@JsxClass(domClass = DomElement.class,
- browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class Element extends EventNode {
@@ -249,7 +249,7 @@
* which matches all elements.
* @return a live NodeList of found elements in the order they appear in the tree
*/
- @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Object getElementsByTagNameNS(final Object namespaceURI, final String localName) {
final String description = "Element.getElementsByTagNameNS('" + namespaceURI + "', '" + localName + "')";
@@ -306,7 +306,7 @@
* Returns the current number of child elements.
* @return the child element count
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getChildElementCount() {
return getDomNodeOrDie().getChildElementCount();
}
@@ -315,7 +315,7 @@
* Returns the first element child.
* @return the first element child
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Element getFirstElementChild() {
final DomElement child = getDomNodeOrDie().getFirstElementChild();
if (child != null) {
@@ -328,7 +328,7 @@
* Returns the last element child.
* @return the last element child
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Element getLastElementChild() {
final DomElement child = getDomNodeOrDie().getLastElementChild();
if (child != null) {
@@ -341,7 +341,7 @@
* Returns the next element sibling.
* @return the next element sibling
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Element getNextElementSibling() {
final DomElement child = getDomNodeOrDie().getNextElementSibling();
if (child != null) {
@@ -354,7 +354,7 @@
* Returns the previous element sibling.
* @return the previous element sibling
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Element getPreviousElementSibling() {
final DomElement child = getDomNodeOrDie().getPreviousElementSibling();
if (child != null) {
@@ -430,7 +430,7 @@
* @param localName the local name of the attribute to look for
* @return the value of the specified attribute, {@code null} if the attribute is not defined
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public String getAttributeNS(final String namespaceURI, final String localName) {
return getDomNodeOrDie().getAttributeNS(namespaceURI, localName);
}
@@ -444,7 +444,7 @@
* @param localName the local name of the attribute to look for
* @return {@code true} if the node has this attribute
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public boolean hasAttributeNS(final String namespaceURI, final String localName) {
return getDomNodeOrDie().hasAttributeNS(namespaceURI, localName);
}
@@ -455,7 +455,7 @@
* @param qualifiedName the qualified name of the attribute to look for
* @param value the new attribute value
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public void setAttributeNS(final String namespaceURI, final String qualifiedName, final String value) {
getDomNodeOrDie().setAttributeNS(namespaceURI, qualifiedName, value);
}
@@ -465,7 +465,7 @@
* @param namespaceURI the namespace URI of the attribute to remove
* @param localName the local name of the attribute to remove
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public void removeAttributeNS(final String namespaceURI, final String localName) {
getDomNodeOrDie().removeAttributeNS(namespaceURI, localName);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -48,7 +48,7 @@
* @author Adam Afeltowicz
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class History extends SimpleScriptable {
@@ -74,7 +74,7 @@
* Returns the {@code state} property.
* @return the {@code state} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Object getState() {
final WebWindow w = getWindow().getWebWindow();
return w.getHistory().getCurrentState();
@@ -129,7 +129,7 @@
* @param title the title
* @param url an optional URL
*/
- @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public void replaceState(final Object object, final String title, final String url) {
final WebWindow w = getWindow().getWebWindow();
final HtmlPage page = (HtmlPage) w.getEnclosedPage();
@@ -154,7 +154,7 @@
* @param title the title
* @param url an optional URL
*/
- @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public void pushState(final Object object, final String title, final String url) {
try {
getWindow().getLocation().setHref(url, true, object);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -69,7 +69,7 @@
* @see <a href="http://msdn.microsoft.com/en-us/library/ms535866.aspx">MSDN Documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class Location extends SimpleScriptable {
@@ -536,7 +536,7 @@
* Returns the {@code origin} property.
* @return the {@code origin} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public String getOrigin() {
return getUrl().getProtocol() + "://" + getHost();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Map.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Map.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Map.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -41,7 +41,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class Map extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageChannel.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageChannel.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessageChannel.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -29,7 +29,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(IE), @WebBrowser(EDGE) })
public class MessageChannel extends SimpleScriptable {
private MessagePort port1_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -43,7 +43,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class MessagePort extends EventTarget {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeType.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeType.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -33,7 +33,7 @@
*
* @see <a href="http://www.xulplanet.com/references/objref/MimeType.html">XUL Planet</a>
*/
-@JsxClass(browsers = { @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class MimeType extends SimpleScriptable {
private String description_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeArray.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeArray.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeArray.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -31,7 +31,7 @@
*
* @see <a href="http://www.xulplanet.com/references/objref/MimeTypeArray.html">XUL Planet</a>
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class MimeTypeArray extends SimpleArray {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -42,7 +42,7 @@
* @see <a href="http://msdn.microsoft.com/en-us/library/ms535867.aspx">MSDN documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class Navigator extends SimpleScriptable {
@@ -106,7 +106,7 @@
* Returns the language of the browser.
* @return the language
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public String getLanguage() {
return getBrowserVersion().getBrowserLanguage();
@@ -152,7 +152,7 @@
* Returns the {@code product} property.
* @return the {@code product} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(EDGE) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(EDGE) })
public String getProduct() {
return "Gecko";
}
@@ -266,7 +266,7 @@
* Returns the {@code geolocation} property.
* @return the {@code geolocation} property
*/
- @JsxGetter({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+ @JsxGetter({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE),
@WebBrowser(EDGE) })
public Geolocation getGeolocation() {
final Geolocation geolocation = new Geolocation();
@@ -288,7 +288,7 @@
* Returns the vendor.
* @return the vendor
*/
- @JsxGetter({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11),
+ @JsxGetter({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE),
@WebBrowser(EDGE)})
public String getVendor() {
return getBrowserVersion().getVendor();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Plugin.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Plugin.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Plugin.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -32,7 +32,7 @@
*
* @see <a href="http://www.xulplanet.com/references/objref/MimeTypeArray.html">XUL Planet</a>
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class Plugin extends SimpleArray {
private String description_;
@@ -102,7 +102,7 @@
* Gets the plugin's version.
* @return the name
*/
- @JsxGetter({ @WebBrowser(value = IE, minVersion = 11), @WebBrowser(FF), @WebBrowser(EDGE) })
+ @JsxGetter({ @WebBrowser(IE), @WebBrowser(FF), @WebBrowser(EDGE) })
public String getVersion() {
return version_;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/PluginArray.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/PluginArray.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/PluginArray.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -32,7 +32,7 @@
*
* @see <a href="http://www.xulplanet.com/references/objref/PluginArray.html">XUL Planet</a>
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class PluginArray extends SimpleArray {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Screen.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -41,7 +41,7 @@
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref.html">Mozilla documentation</a>
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class Screen extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Set.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Set.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Set.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -41,7 +41,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class Set extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -43,7 +43,7 @@
* @author Marc Guillemot
*/
@JsxClasses({
- @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+ @JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
})
public class Storage extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/URL.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/URL.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/URL.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -29,7 +29,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class URL extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakMap.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WeakMap.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -40,7 +40,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class WeakMap extends SimpleScriptable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -52,7 +52,7 @@
*
* @see <a href="https://developer.mozilla.org/en/WebSockets/WebSockets_reference/WebSocket">Mozilla documentation</a>
*/
-@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11),
+@JsxClass(browsers = { @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE),
@WebBrowser(EDGE) })
public class WebSocket extends EventTarget implements AutoCloseable {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-12-29 17:17:47 UTC (rev 11677)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-12-29 17:23:36 UTC (rev 11678)
@@ -273,7 +273,7 @@
* @param stringToEncode string to encode
* @return the encoded string
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public String btoa(final String stringToEncode) {
return new String(Base64.encodeBase64(stringToEncode.getBytes()));
}
@@ -283,7 +283,7 @@
* @param encodedData the encoded string
* @return the decoded value
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public String atob(final String encodedData) {
return new String(Base64.decodeBase64(encodedData.getBytes()));
}
@@ -340,7 +340,7 @@
* Returns the application cache.
* @return the application cache
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public ApplicationCache getApplicationCache() {
return applicationCache_;
}
@@ -626,7 +626,7 @@
* Returns the console property.
* @return the console property
*/
- @JsxGetter({ @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(CHROME) })
+ @JsxGetter({ @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(CHROME) })
public ScriptableObject getConsole() {
return console_;
}
@@ -635,7 +635,7 @@
* Sets the console.
* @param console the console
*/
- @JsxSetter({ @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(CHROME) })
+ @JsxSetter({ @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(CHROME) })
public void setConsole(final ScriptableObject console) {
console_ = console;
}
@@ -1493,7 +1493,7 @@
* @return a dummy value
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref28.html">Mozilla doc</a>
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getInnerWidth() {
return getWebWindow().getInnerWidth();
}
@@ -1503,7 +1503,7 @@
* @return a dummy value
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref79.html">Mozilla doc</a>
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getOuterWidth() {
return getWebWindow().getOuterWidth();
}
@@ -1513,7 +1513,7 @@
* @return a dummy value
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref27.html">Mozilla doc</a>
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getInnerHeight() {
return getWebWindow().getInnerHeight();
}
@@ -1523,7 +1523,7 @@
* @return a dummy value
* @see <a href="http://www.mozilla.org/docs/dom/domref/dom_window_ref78.html">Mozilla doc</a>
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getOuterHeight() {
return getWebWindow().getOuterHeight();
}
@@ -1546,7 +1546,7 @@
* @param type the type of events to capture
* @see Document#captureEvents(String)
*/
- @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public void captureEvents(final String type) {
// Empty.
}
@@ -1568,7 +1568,7 @@
* @param pseudo a string specifying the pseudo-element to match (may be {@code null})
* @return the computed style
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(CHROME) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(CHROME) })
public CSS2Properties getComputedStyle(final Element element, final String pseudo) {
CSS2Properties style;
@@ -1605,7 +1605,7 @@
* Returns the current selection.
* @return the current selection
*/
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public Selection getSelection() {
final WebWindow webWindow = getWebWindow();
// return null if the window is in a frame that is not displayed
@@ -1934,7 +1934,7 @@
* Returns the value of {@code pageXOffset} property.
* @return the value of {@code pageXOffset} property
*/
- @JsxGetter({ @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(CHROME) })
+ @JsxGetter({ @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(CHROME) })
public int getPageXOffset() {
return 0;
}
@@ -1943,7 +1943,7 @@
* Returns the value of {@code pageYOffset} property.
* @return the value of {@code pageYOffset} property
*/
- @JsxGetter({ @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11), @WebBrowser(CHROME) })
+ @JsxGetter({ @WebBrowser(FF), @WebBrowser(IE), @WebBrowser(CHROME) })
public int getPageYOffset() {
return 0;
}
@@ -1999,7 +1999,7 @@
* called <tt>preventDefault</tt>; {@code true} otherwise
*/
@Override
- @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(IE) })
public boolean dispatchEvent(final Event event) {
event.setTarget(this);
final ScriptResult result = fireEvent(event);
@@ -2011,7 +2011,7 @@
* @return the handler
*/
@JsxGetter({@WebBrowser(FF), @WebBrowser(CHROME),
- @WebBrowser(value = IE, minVersion = 11) })
+ @WebBrowser(IE) })
public Object getOnchange() {
return getHandlerForJavaScript(Event.TYPE_CHANGE);
}
@@ -2021,7 +2021,7 @@
* @param onchange the handler
*/
@JsxSetter({@WebBrowser(FF), @WebBrowser(CHROME),
- @WebBrowser(value = IE, minVersion = 11) })
+ @WebBrowser(IE) })
public void setOnchange(final Object onchange) {
setHandlerForJavaScript(Event.TYPE_CHANGE, onchange);
}
@@ -2031,7 +2031,7 @@
* @return the handler
*/
@JsxGetter({@WebBrowser(FF), @WebBrowser(CHROME),
- @WebBrowser(value = IE, minVersion = 11) })
+ @WebBrowser(IE) })
public Object getOnsubmit() {
return getHandlerForJavaScript(Event.TYPE_SUBMIT);
}
@@ -2041,7 +2041,7 @@
* @param onsubmit the handler
*/
@JsxSetter({@WebBrowser(FF), @WebBrowser(CHROME),
- @WebBrowser(value = IE, minVersion = 11) })
+ @WebBrowser(IE) })
public void setOnsubmit(final Object onsubmit) {
setHandlerForJavaScript(Event.TYPE_SUBMIT, onsubmit);
}
@@ -2124,7 +2124,7 @@
* Returns the {@code performance} property.
* @return the {@code performance} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public Performance getPerformance() {
final Performance performance = new Performance();
performance.setParentScope(this);
@@ -2136,7 +2136,7 @@
* Returns the {@code devicePixelRatio} property.
* @return the {@code devicePixelRatio} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public int getDevicePixelRatio() {
return 1;
}
@@ -2145,7 +2145,7 @@
* Returns the {@code styleMedia} property.
* @return the {@code styleMedia} property
*/
- @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxGetter({ @WebBrowser(CHROME), @WebBrowser(IE) })
public StyleMedia getStyleMedia() {
final StyleMedia styleMedia = new StyleMedia();
styleMedia.setParentScope(this);
@@ -2159,7 +2159,7 @@
* @param mediaQueryString the media query
* @return a new MediaQueryList object
*/
- @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(value = IE, minVersion = 11) })
+ @JsxFunction({ @WebBrowser(CHROME), @WebBrowser(FF), @WebBrowser(IE) })
public MediaQueryList matchMedia(final String mediaQueryString) {
final MediaQueryList mediaQueryList = new MediaQueryList(mediaQueryString);
mediaQueryList.setParentScope(this);
|
|
From: <asa...@us...> - 2016-02-23 10:28:44
|
Revision: 11892
http://sourceforge.net/p/htmlunit/code/11892
Author: asashour
Date: 2016-02-23 10:28:42 +0000 (Tue, 23 Feb 2016)
Log Message:
-----------
Use Scriptable instead of HtmlUnitScriptable.
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2016-02-23 09:42:53 UTC (rev 11891)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2016-02-23 10:28:42 UTC (rev 11892)
@@ -184,8 +184,8 @@
private void init(final WebWindow webWindow, final Context context) throws Exception {
final WebClient webClient = webWindow.getWebClient();
final BrowserVersion browserVersion = webClient.getBrowserVersion();
- final Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> prototypes = new HashMap<>();
- final Map<String, HtmlUnitScriptable> prototypesPerJSName = new HashMap<>();
+ final Map<Class<? extends Scriptable>, Scriptable> prototypes = new HashMap<>();
+ final Map<String, Scriptable> prototypesPerJSName = new HashMap<>();
final Window window = new Window();
((SimpleScriptable) window).setClassName("Window");
@@ -404,7 +404,7 @@
// once all prototypes have been build, it's possible to configure the chains
final Scriptable objectPrototype = ScriptableObject.getObjectPrototype(window);
- for (final Map.Entry<String, HtmlUnitScriptable> entry : prototypesPerJSName.entrySet()) {
+ for (final Map.Entry<String, Scriptable> entry : prototypesPerJSName.entrySet()) {
final String name = entry.getKey();
final ClassConfiguration config = jsConfig_.getClassConfiguration(name);
final Scriptable prototype = entry.getValue();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2016-02-23 09:42:53 UTC (rev 11891)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2016-02-23 10:28:42 UTC (rev 11892)
@@ -84,7 +84,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlSelect;
import com.gargoylesoftware.htmlunit.html.HtmlStyle;
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
-import com.gargoylesoftware.htmlunit.javascript.HtmlUnitScriptable;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
import com.gargoylesoftware.htmlunit.javascript.PostponedAction;
import com.gargoylesoftware.htmlunit.javascript.ScriptableWithFallbackGetter;
@@ -186,8 +185,8 @@
private Event currentEvent_;
private String status_ = "";
private HTMLCollection frames_; // has to be a member to have equality (==) working
- private Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> prototypes_ = new HashMap<>();
- private Map<String, HtmlUnitScriptable> prototypesPerJSName_ = new HashMap<>();
+ private Map<Class<? extends Scriptable>, Scriptable> prototypes_ = new HashMap<>();
+ private Map<String, Scriptable> prototypesPerJSName_ = new HashMap<>();
private Object controllers_;
private Object opener_;
private Object top_ = NOT_FOUND; // top can be set from JS to any value!
@@ -244,8 +243,8 @@
* @param map a Map of ({@link Class}, {@link Scriptable})
* @param prototypesPerJSName map of {@link String} and {@link Scriptable}
*/
- public void setPrototypes(final Map<Class<? extends HtmlUnitScriptable>, HtmlUnitScriptable> map,
- final Map<String, HtmlUnitScriptable> prototypesPerJSName) {
+ public void setPrototypes(final Map<Class<? extends Scriptable>, Scriptable> map,
+ final Map<String, Scriptable> prototypesPerJSName) {
prototypes_ = map;
prototypesPerJSName_ = prototypesPerJSName;
}
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X