window is created as final step in env.js so it is available without …

…manual construction
thatcher · Feb 4, 2010 · 12e5b40 · 12e5b40
1 parent 8995a76
commit 12e5b40
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 8 deletions.
diff --git a/build.xml b/build.xml
@@ -108,7 +108,7 @@
                     <token key="VERSION" value="core-env.${BUILD_VERSION}"/>
                 </replacetokens>
             </filterchain>
-            <fileset dir="${SRC_DIR}" includes="env/__global__.js" />
+            <fileset dir="${SRC_DIR}" includes="env/core/__global__.js" />
             <fileset dir="${SRC_DIR}" includes="common/intro.js" />
             <fileset dir="${SRC_DIR}" includes="env/core/console.js" />
             <fileset dir="${SRC_DIR}" includes="env/core/dom.js" />
@@ -134,6 +134,7 @@
                     <token key="VERSION" value="rhino-env.${BUILD_VERSION}"/>
                 </replacetokens>
             </filterchain>
+            <fileset dir="${SRC_DIR}" includes="env/rhino/__global__.js" />
             <fileset dir="${SRC_DIR}" includes="common/intro.js" />
             <fileset dir="${SRC_DIR}" includes="env/rhino/console.js" />
             <fileset dir="${SRC_DIR}" includes="env/rhino/dom.js" />

diff --git a/dist/platform/core.js b/dist/platform/core.js
@@ -26,6 +26,7 @@ Envjs.appCodeName  = "Envjs";
 //eg "Gecko/20070309 Firefox/2.0.0.3"
 Envjs.appName      = "Resig/20070309 PilotFish/1.2.0.1";
 
+
 /*
  * Envjs core-env.1.2.0.0 
  * Pure JavaScript Browser Environment

diff --git a/dist/platform/rhino.js b/dist/platform/rhino.js
@@ -1,3 +1,11 @@
+/*
+ * Envjs rhino-env.1.2.0.0 
+ * Pure JavaScript Browser Environment
+ * By John Resig <http://ejohn.org/> and the Envjs Team
+ * Copyright 2008-2010 John Resig, under the MIT License
+ */
+
+var __context__ = Packages.org.mozilla.javascript.Context.getCurrentContext();
 
 /*
  * Envjs rhino-env.1.2.0.0 
@@ -39,6 +47,25 @@ Envjs.sleep = function(millseconds){
     java.lang.Thread.currentThread().sleep(millseconds);
 };
 
+/**
+ * provides callback hook for when the system exits
+ */
+Envjs.onExit = function(callback){
+    var rhino = Packages.org.mozilla.javascript,
+        contextFactory =  __context__.getFactory(),
+        listener = new rhino.ContextFactory.Listener({
+            contextReleased: function(context){
+                if(context === __context__)
+                    console.log('context released', context);
+                contextFactory.removeListener(this);
+                if(callback)
+                    callback();
+            }
+        });
+    contextFactory.addListener(listener);
+};
+
+
 /**
  * resolves location relative to doc location
  * @param {Object} path

diff --git a/dist/window.js b/dist/window.js
@@ -5,7 +5,8 @@
 var Window,
     Screen,
     History,
-    Navigator;
+    Navigator,
+    __this__ = this;
 
 
 /*
@@ -547,6 +548,11 @@ Window = function(scope, parent, opener){
 
 var __windows__ = {};
 
+//finally pre-supply the window with the window-like environment
+new Window(__this__, __this__);
+
+
+
 /**
  * @author john resig & the envjs team
  * @uri http://www.envjs.com/

diff --git a/.local_settings.js → local_settings.js b/.local_settings.js → local_settings.js
diff --git a/src/env/__global__.js → src/env/core/__global__.js b/src/env/__global__.js → src/env/core/__global__.js
@@ -25,3 +25,4 @@ var Envjs = function(){
 Envjs.appCodeName  = "Envjs";
 //eg "Gecko/20070309 Firefox/2.0.0.3"
 Envjs.appName      = "Resig/20070309 PilotFish/1.2.0.1";
+
diff --git a/src/env/rhino/__global__.js b/src/env/rhino/__global__.js
@@ -0,0 +1,8 @@
+/*
+ * Envjs @VERSION@ 
+ * Pure JavaScript Browser Environment
+ * By John Resig <http://ejohn.org/> and the Envjs Team
+ * Copyright 2008-2010 John Resig, under the MIT License
+ */
+
+var __context__ = Packages.org.mozilla.javascript.Context.getCurrentContext();
diff --git a/src/env/rhino/timer.js b/src/env/rhino/timer.js
@@ -13,3 +13,22 @@ Envjs.sync = sync;
 Envjs.sleep = function(millseconds){
     java.lang.Thread.currentThread().sleep(millseconds);
 };
+
+/**
+ * provides callback hook for when the system exits
+ */
+Envjs.onExit = function(callback){
+    var rhino = Packages.org.mozilla.javascript,
+        contextFactory =  __context__.getFactory(),
+        listener = new rhino.ContextFactory.Listener({
+            contextReleased: function(context){
+                if(context === __context__)
+                    console.log('context released', context);
+                contextFactory.removeListener(this);
+                if(callback)
+                    callback();
+            }
+        });
+    contextFactory.addListener(listener);
+};
+
diff --git a/src/window/__global__.js b/src/window/__global__.js
@@ -5,5 +5,6 @@
 var Window,
     Screen,
     History,
-    Navigator;
+    Navigator,
+    __this__ = this;
 
diff --git a/src/window/window.js b/src/window/window.js
@@ -283,3 +283,8 @@ Window = function(scope, parent, opener){
 };
 
 var __windows__ = {};
+
+//finally pre-supply the window with the window-like environment
+new Window(__this__, __this__);
+
+
diff --git a/test/specs/env/spec.js b/test/specs/env/spec.js
@@ -50,7 +50,8 @@ test('Envjs Platform Interfaces Available', function(){
 });
 
 
-var document = null;
+var document = null,
+    path = 'specs/env/spec.html';
 
 test('Envjs.location', function(){
 
@@ -120,5 +121,9 @@ test('Envjs.proxy', function(){
 
 });
 
+Envjs.onExit(function(){
+    console.log('onExit!');
+});
+
 _start();
 
diff --git a/test/specs/window/spec.js b/test/specs/window/spec.js
@@ -9,8 +9,7 @@ var _load,
     _endtime,
     Envjs;
 
-var __this__ = this,
-    expected_path = 'test/specs/window/spec.html';
+var expected_path = 'test/specs/window/spec.html';
 
 try{
     _load = load;
@@ -27,11 +26,10 @@ try{
     _load('settings.js');
     _load('local_settings.js');
 
-    //mock the window and document in envjs
-    new Window(__this__, __this__);
     document.async = false;
 
     _load('test/specs/qunit.js');
+
     location = SETTINGS.AJAX_BASE + expected_path;
 
 }catch(e){