Skip to content

Commit 9e3fb95

Browse files
committed
fix js prototype tree
1 parent 49524a4 commit 9e3fb95

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/java/org/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ else if (browserVersion.isFirefox()) {
132132

133133
final String extendedClassName;
134134
final Class<?> superClass = klass.getSuperclass();
135-
if (superClass == HtmlUnitScriptable.class) {
135+
if (superClass.getAnnotation(JsxClass.class) == null
136+
&& superClass.getAnnotation(JsxClasses.class) == null) {
136137
extendedClassName = "";
137138
}
138139
else {
@@ -175,7 +176,8 @@ else if (browserVersion.isFirefox()) {
175176

176177
final String extendedClassName;
177178
final Class<?> superClass = klass.getSuperclass();
178-
if (superClass == HtmlUnitScriptable.class) {
179+
if (superClass.getAnnotation(JsxClass.class) == null
180+
&& superClass.getAnnotation(JsxClasses.class) == null) {
179181
extendedClassName = "";
180182
}
181183
else {

src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
import org.htmlunit.javascript.host.css.StyleMedia;
127127
import org.htmlunit.javascript.host.css.StyleSheet;
128128
import org.htmlunit.javascript.host.css.StyleSheetList;
129-
import org.htmlunit.javascript.host.dom.AbstractList;
130129
import org.htmlunit.javascript.host.dom.AbstractRange;
131130
import org.htmlunit.javascript.host.dom.Attr;
132131
import org.htmlunit.javascript.host.dom.CDATASection;
@@ -545,7 +544,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
545544
@SuppressWarnings("unchecked")
546545
static final Class<? extends HtmlUnitScriptable>[] CLASSES_ = new Class[] {
547546
// level 1
548-
AbortController.class, AbstractList.class, AbstractRange.class, Atomics.class, AudioBuffer.class,
547+
AbortController.class, AbstractRange.class, Atomics.class, AudioBuffer.class,
549548
AudioListener.class, AudioParam.class, BarProp.class, Blob.class, CSS.class, CSSRule.class,
550549
CSSRuleList.class, CSSStyleDeclaration.class, Cache.class, CacheStorage.class, CanvasGradient.class,
551550
CanvasPattern.class, CanvasRenderingContext2D.class, CaretPosition.class, ClientRect.class,

src/main/java/org/htmlunit/javascript/host/dom/AbstractList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.htmlunit.html.HtmlElement;
3535
import org.htmlunit.html.HtmlPage;
3636
import org.htmlunit.javascript.HtmlUnitScriptable;
37-
import org.htmlunit.javascript.configuration.JsxClass;
3837

3938
/**
4039
* The parent class of {@link NodeList} and {@link org.htmlunit.javascript.host.html.HTMLCollection}.
@@ -46,7 +45,6 @@
4645
* @author Frank Danek
4746
* @author Ronald Brill
4847
*/
49-
@JsxClass(isJSObject = false)
5048
public class AbstractList extends HtmlUnitScriptable implements ExternalArrayData {
5149

5250
/**

0 commit comments

Comments
 (0)