Merge branch 'glen/master'

thatcher · Aug 19, 2009 · 500212d · 500212d
2 parents 9bc5f5d + e6a3a37
commit 500212d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -179,7 +179,6 @@ var Envjs = function(){
     $env.loadFrame = function(frame, url){
         try {
 
-            /* this code semi-duplicated in dom/implementation.js -- sorry */
             var frameWindow,
             	makingNewWinFlag = !(frame._content);
             if (makingNewWinFlag)
@@ -196,7 +195,7 @@ var Envjs = function(){
             // global/window and won't be able to get at them....
             var local__window__    = $env.window,
             	local_env          = $env,
-            	local_window       = window;
+                local_window       = frame.ownerDocument.parentWindow;
 
             // a local function gives us something whose scope
             // is easy to change
@@ -215,7 +214,7 @@ var Envjs = function(){
             // change scope of window object creation
             //   functions, so that functions/code they create
             //   will be scoped to new window object
-            // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java
+            // getScope()/setScope() from Window.java
             var scopes = {
                 frame : $env.getScope(__frame__),
                 window : $env.getScope(local__window__),

diff --git a/src/platform/core.js b/src/platform/core.js
@@ -174,7 +174,6 @@ var Envjs = function(){
     $env.loadFrame = function(frame, url){
         try {
 
-            /* this code semi-duplicated in dom/implementation.js -- sorry */
             var frameWindow,
             	makingNewWinFlag = !(frame._content);
             if (makingNewWinFlag)
@@ -191,7 +190,7 @@ var Envjs = function(){
             // global/window and won't be able to get at them....
             var local__window__    = $env.window,
             	local_env          = $env,
-            	local_window       = window;
+                local_window       = frame.ownerDocument.parentWindow;
 
             // a local function gives us something whose scope
             // is easy to change
@@ -210,7 +209,7 @@ var Envjs = function(){
             // change scope of window object creation
             //   functions, so that functions/code they create
             //   will be scoped to new window object
-            // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java
+            // getScope()/setScope() from Window.java
             var scopes = {
                 frame : $env.getScope(__frame__),
                 window : $env.getScope(local__window__),