scope handling (wip)

Author: rbri

src/main/java/org/htmlunit/javascript/host/Element.java

@@ -514,7 +514,7 @@ public Attr setAttributeNode(final Attr newAtt) {
     @JsxFunction
     public NodeList querySelectorAll(final String selectors) {
         try {
-            return NodeList.staticNodeList(this, getDomNodeOrDie().querySelectorAll(selectors));
+            return NodeList.staticNodeList(getParentScope(), getDomNodeOrDie().querySelectorAll(selectors));
         }
         catch (final CSSException e) {
             throw JavaScriptEngine.asJavaScriptException(

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

@@ -995,7 +995,7 @@ public Node querySelector(final String selectors) {
     @JsxFunction
     public NodeList querySelectorAll(final String selectors) {
         try {
-            return NodeList.staticNodeList(this, getDomNodeOrDie().querySelectorAll(selectors));
+            return NodeList.staticNodeList(getParentScope(), getDomNodeOrDie().querySelectorAll(selectors));
         }
         catch (final CSSException e) {
             throw JavaScriptEngine.asJavaScriptException(

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

@@ -130,7 +130,7 @@ public static void moveBefore(final Context context, final Scriptable scope,
     @JsxFunction
     public NodeList querySelectorAll(final String selectors) {
         try {
-            return NodeList.staticNodeList(this, getDomNodeOrDie().querySelectorAll(selectors));
+            return NodeList.staticNodeList(getParentScope(), getDomNodeOrDie().querySelectorAll(selectors));
         }
         catch (final CSSException e) {
             throw JavaScriptEngine.reportRuntimeError("An invalid or illegal selector was specified (selector: '"

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

@@ -23,10 +23,8 @@
 import org.htmlunit.corejs.javascript.ContextAction;
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Scriptable;
-import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.javascript.HtmlUnitContextFactory;
-import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
@@ -90,7 +88,7 @@ public NodeList(final DomNode domNode, final List<DomNode> initialElements) {
      * Creates an instance.
      * @param parentScope the parent scope
      */
-    NodeList(final ScriptableObject parentScope) {
+    NodeList(final Scriptable parentScope) {
         super();
         setParentScope(parentScope);
         setPrototype(getPrototype(getClass()));
@@ -104,7 +102,7 @@ public NodeList(final DomNode domNode, final List<DomNode> initialElements) {
      * @param elements the elements
      * @return an empty collection
      */
-    public static NodeList staticNodeList(final HtmlUnitScriptable parentScope, final List<DomNode> elements) {
+    public static NodeList staticNodeList(final Scriptable parentScope, final List<DomNode> elements) {
         return new NodeList(parentScope) {
             @Override
             public List<DomNode> getElements() {

src/main/java/org/htmlunit/javascript/host/html/HTMLDocument.java

@@ -571,7 +571,7 @@ public NodeList getElementsByName(final String elementName) {
         if ("null".equals(elementName)
                 || (elementName.isEmpty()
                     && getBrowserVersion().hasFeature(HTMLDOCUMENT_ELEMENTS_BY_NAME_EMPTY))) {
-            return NodeList.staticNodeList(getWindow(), new ArrayList<>());
+            return NodeList.staticNodeList(getParentScope(), new ArrayList<>());
         }
 
         final HtmlPage page = getPage();