Skip to content

Commit 557e787

Browse files
committed
scope handling fix (wip)
1 parent 41215db commit 557e787

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void postMessage(final String message, final Object transfer) {
110110
final URL currentURL = page.getUrl();
111111
final String origin = currentURL.getProtocol() + "://" + currentURL.getHost() + ':' + currentURL.getPort();
112112
event.initMessageEvent(Event.TYPE_MESSAGE, false, false, message, origin, "", w, transfer);
113-
event.setParentScope(port_);
113+
event.setParentScope(getParentScope());
114114
event.setPrototype(getPrototype(event.getClass()));
115115

116116
final AbstractJavaScriptEngine<?> jsEngine = webWindow.getWebClient().getJavaScriptEngine();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Netscape extends HtmlUnitScriptable {
2727

2828
Netscape(final Window window) {
2929
super();
30-
setParentScope(window);
30+
setParentScope(window.getWebWindow().getTopLevelScope());
3131

3232
// simply put "new Object()" for property "security"
3333
put("security", this, JavaScriptEngine.newObject(window));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ else if (e.getCause() instanceof EcmaError ecmaError) {
14381438
}
14391439

14401440
final Object[] args = {msg, url, Integer.valueOf(line), Integer.valueOf(column), jsError};
1441-
f.call(Context.getCurrentContext(), this, this, args);
1441+
f.call(Context.getCurrentContext(), getWebWindow().getTopLevelScope(), this, args);
14421442
}
14431443
}
14441444

0 commit comments

Comments
 (0)