Implemented support for window.top property, matching test case.

thatcher · Jul 14, 2009 · 91ab5a2 · 91ab5a2
1 parent c620c9e
commit 91ab5a2
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 16 deletions.
diff --git a/dist/env.js b/dist/env.js
@@ -8,7 +8,8 @@
 try {
         // this goes into the global namespace, but less likely to collide with
         //   client JS code than methods in Rhino shell (load, print, etc.)
-    _$envjs$makeObjectIntoWindow$_ = function($w, $env, $parentWindow){
+    _$envjs$makeObjectIntoWindow$_ = function($w, $env,
+                                              $parentWindow, $initTop){
 
         // The Window Object
         var __this__ = $w;
@@ -100,7 +101,7 @@ var $status = '';
 // a read-only reference to the top-level window that contains this window.  If this
 // window is a top-level window it is simply a refernce to itself.  If this window 
 // is a frame, the top property refers to the top-level window that contains the frame.
-var $top;
+var $top = $initTop;
 
 // the window property is identical to the self property and to this obj
 var $window = $w;
@@ -3764,7 +3765,8 @@ function __parseLoop__(impl, doc, p) {
                  iNodeParent.src);
           var frameWindow = {};   // temporary, will replace with a new global
           try {
-            _$envjs$makeObjectIntoWindow$_(frameWindow, $env, window);
+            _$envjs$makeObjectIntoWindow$_(frameWindow, $env,
+                                           window, window.top);
             frameWindow.location = iNodeParent.src;
             iNodeParent._content = frameWindow;
           } catch(e){
@@ -9931,7 +9933,7 @@ try{
 
         // turn "original" JS interpreter global object into the
         //   "root" window object; third param value for new window's "parent"
-    _$envjs$makeObjectIntoWindow$_(this, Envjs, null);
+    _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this);
 
 } catch(e){
     Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" +

diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -445,7 +445,8 @@ var Envjs = function(){
 try {
         // this goes into the global namespace, but less likely to collide with
         //   client JS code than methods in Rhino shell (load, print, etc.)
-    _$envjs$makeObjectIntoWindow$_ = function($w, $env, $parentWindow){
+    _$envjs$makeObjectIntoWindow$_ = function($w, $env,
+                                              $parentWindow, $initTop){
 
         // The Window Object
         var __this__ = $w;
@@ -537,7 +538,7 @@ var $status = '';
 // a read-only reference to the top-level window that contains this window.  If this
 // window is a top-level window it is simply a refernce to itself.  If this window 
 // is a frame, the top property refers to the top-level window that contains the frame.
-var $top;
+var $top = $initTop;
 
 // the window property is identical to the self property and to this obj
 var $window = $w;
@@ -4201,7 +4202,8 @@ function __parseLoop__(impl, doc, p) {
                  iNodeParent.src);
           var frameWindow = {};   // temporary, will replace with a new global
           try {
-            _$envjs$makeObjectIntoWindow$_(frameWindow, $env, window);
+            _$envjs$makeObjectIntoWindow$_(frameWindow, $env,
+                                           window, window.top);
             frameWindow.location = iNodeParent.src;
             iNodeParent._content = frameWindow;
           } catch(e){
@@ -10368,7 +10370,7 @@ try{
 
         // turn "original" JS interpreter global object into the
         //   "root" window object; third param value for new window's "parent"
-    _$envjs$makeObjectIntoWindow$_(this, Envjs, null);
+    _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this);
 
 } catch(e){
     Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" +

diff --git a/src/dom/implementation.js b/src/dom/implementation.js
@@ -250,7 +250,8 @@ function __parseLoop__(impl, doc, p) {
                  iNodeParent.src);
           var frameWindow = {};   // temporary, will replace with a new global
           try {
-            _$envjs$makeObjectIntoWindow$_(frameWindow, $env, window);
+            _$envjs$makeObjectIntoWindow$_(frameWindow, $env,
+                                           window, window.top);
             frameWindow.location = iNodeParent.src;
             iNodeParent._content = frameWindow;
           } catch(e){

diff --git a/src/intro.js b/src/intro.js
@@ -8,7 +8,8 @@
 try {
         // this goes into the global namespace, but less likely to collide with
         //   client JS code than methods in Rhino shell (load, print, etc.)
-    _$envjs$makeObjectIntoWindow$_ = function($w, $env, $parentWindow){
+    _$envjs$makeObjectIntoWindow$_ = function($w, $env,
+                                              $parentWindow, $initTop){
 
         // The Window Object
         var __this__ = $w;

diff --git a/src/outro.js b/src/outro.js
@@ -8,7 +8,7 @@
 
         // turn "original" JS interpreter global object into the
         //   "root" window object; third param value for new window's "parent"
-    _$envjs$makeObjectIntoWindow$_(this, Envjs, null);
+    _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this);
 
 } catch(e){
     Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" +

diff --git a/src/window/window.js b/src/window/window.js
@@ -82,7 +82,7 @@ var $status = '';
 // a read-only reference to the top-level window that contains this window.  If this
 // window is a top-level window it is simply a refernce to itself.  If this window 
 // is a frame, the top property refers to the top-level window that contains the frame.
-var $top;
+var $top = $initTop;
 
 // the window property is identical to the self property and to this obj
 var $window = $w;

diff --git a/test/unit/dom.js b/test/unit/dom.js
@@ -1,7 +1,7 @@
 // dependencies for the tests
 $w = { }
 $env = { debug: function() {} }
-$parentWindow = null;
+$parentWindow = $initTop = null;
 load("src/window/window.js", "src/dom/node.js");
 
 

diff --git a/test/unit/frame.js b/test/unit/frame.js
@@ -12,7 +12,7 @@ module("frame");
 
 // all tests to next comment rely on content of ../html/iframe.html
 test("IFRAMEs load with accessible content", function() {
-    expect(4);
+    expect(5);
 
     var iframe = document.getElementById('loadediframe');
     try{ok (iframe.src == "html/iframe.html",
@@ -32,7 +32,11 @@ test("IFRAMEs load with accessible content", function() {
     }catch(e){print(e);}
 
     try{ok (idoc.parentWindow.parent == window,
-        "can follow chain from iframe's doc to containing window");
+        "Can follow chain from iframe's doc to containing window");
+    }catch(e){print(e);}
+
+    try{ok (iframe.contentWindow.top == window,
+        "'.top' from iframe does point to top window");
     }catch(e){print(e);}
 });
 

diff --git a/test/unit/parser.js b/test/unit/parser.js
@@ -1,7 +1,7 @@
 // environment mocking for parser
 $w = { }
 $env = { debug: function() {} }
-$parentWindow = null;
+$parentWindow = $initTop = null;
 
 load("src/window/window.js", "src/dom/parser.js", "src/dom/entities.js");
 

diff --git a/test/unit/window.js b/test/unit/window.js
@@ -24,3 +24,18 @@ test("Window Global Scope Equivalence", function() {
         "'window' provides Math.* when referenced implicitly/global");
     }catch(e){print(e);}
 });
+
+
+test("References to the window object", function() {
+    expect(3);
+
+    try{ ok(window == window.window,
+        "'window' is property of the window object");
+    }catch(e){print(e);}
+    try{ ok(window == self,
+        "'self' refers to the current window");
+    }catch(e){print(e);}
+    try{ ok(window == window.top,
+        "for top-level document 'window.top' refers to itself");
+    }catch(e){print(e);}
+});