[HtmlUnit] SVN: [14787] trunk/htmlunit/src

[<asa...@us...>]

Revision: 14787
          http://sourceforge.net/p/htmlunit/code/14787
Author:   asashour
Date:     2017-08-11 09:26:26 +0000 (Fri, 11 Aug 2017)
Log Message:
-----------
Fixing build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/FormField.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/annotations/BuildServerDiscrepancy.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-08-11 09:19:51 UTC (rev 14786)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-08-11 09:26:26 UTC (rev 14787)
@@ -123,7 +123,7 @@
 
         style_ = new CSSStyleDeclaration(this);
 
-        setParentScope(getWindow());
+        setParentScope(getWindow().getDocument());
 
         /**
          * Convert JavaScript snippets defined in the attribute map to executable event handlers.

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java	2017-08-11 09:19:51 UTC (rev 14786)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java	2017-08-11 09:26:26 UTC (rev 14787)
@@ -32,6 +32,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlBody;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.javascript.host.Window;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDocument;
 
 import net.sourceforge.htmlunit.corejs.javascript.Function;
 import net.sourceforge.htmlunit.corejs.javascript.NativeObject;
@@ -230,14 +231,19 @@
         if (listeners != null && !listeners.isEmpty()) {
             event.setCurrentTarget(jsNode_);
 
-            final Window window;
+            final HtmlPage page;
             if (jsNode_ instanceof Window) {
-                window = (Window) jsNode_;
+                page = (HtmlPage) ((Window) jsNode_).getDomNodeOrDie();
             }
             else {
-                window = (Window) jsNode_.getParentScope();
+                final Scriptable parentScope = jsNode_.getParentScope();
+                if (parentScope instanceof HTMLDocument) {
+                    page = ((HTMLDocument) parentScope).getPage();
+                }
+                else {
+                    page = (HtmlPage) ((Window) parentScope).getDomNodeOrDie();
+                }
             }
-            final HtmlPage page = (HtmlPage) window.getDomNodeOrDie();
 
             // no need for a copy, listeners are copy on write
             for (final Scriptable listener : listeners) {

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/FormField.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/FormField.java	2017-08-11 09:19:51 UTC (rev 14786)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/FormField.java	2017-08-11 09:26:26 UTC (rev 14787)
@@ -46,7 +46,7 @@
 
         final HtmlForm form = ((HtmlElement) domNode).getEnclosingForm();
         if (form != null) {
-            setParentScope(getScriptableFor(form).getParentScope());
+            setParentScope(getScriptableFor(form));
         }
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/annotations/BuildServerDiscrepancy.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/annotations/BuildServerDiscrepancy.java	2017-08-11 09:19:51 UTC (rev 14786)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/annotations/BuildServerDiscrepancy.java	2017-08-11 09:26:26 UTC (rev 14787)
@@ -20,7 +20,7 @@
 import java.lang.annotation.Target;
 
 /**
- * An annotation to denote a test which behaves on the build server differnt than locally.
+ * An annotation to denote a test which behaves on the build server different than locally.
  *
  * @author Ahmed Ashour
  */