Merge branch 'envjsrb' of github.com:smparkes/env-js into envjsrb

smparkes · Feb 6, 2010 · 965db6e · 965db6e
2 parents 78786f1 + dfb5e51
commit 965db6e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Rakefile b/Rakefile
@@ -50,9 +50,9 @@ namespace :johnson do
 
   desc "run tests against johnson"
   task :test => :compile do
-    ruby "-Ilib:vendor/johnson/lib bin/envjsrb test/primary-tests.js"
-    ruby "-Ilib:vendor/johnson/lib bin/envjsrb test/prototype-test.js"
-    ruby "-Ilib:vendor/johnson/lib bin/envjsrb test/call-load-test.js"
+    ruby "bin/envjsrb test/primary-tests.js"
+    ruby "bin/envjsrb test/prototype-test.js"
+    ruby "bin/envjsrb test/call-load-test.js"
   end
 
 end
@@ -70,7 +70,7 @@ begin
     s.email = "smparkes@smparkes.net" # Just for the ruby part ...
     s.homepage = "http://github.com/thatcher/env-js"
     s.description = "Browser environment for javascript interpreters"
-    s.authors = ["John Resig", "Chris Thatcher" ]
+    s.authors = ["John Resig", "Chris Thatcher", "Steven Parkes" ]
     s.add_dependency "johnson", ">= 2.0.0.pre0"
     s.files = 
       FileList[ "",

diff --git a/src/dom/document.js b/src/dom/document.js
@@ -130,8 +130,11 @@ __extend__(DOMDocument.prototype, {
             xhr = ({
                 open: function(){},
                 send: function(){
-                    this.responseText = content;
-                    this.onreadystatechange();
+                    var self = this;
+                    setTimeout(function(){
+                        self.responseText = content;
+                        self.onreadystatechange();
+                    },0);
                 },
                 status: 200
             });

diff --git a/src/intro.js b/src/intro.js
@@ -35,7 +35,8 @@
       $platform.init_window = function(window) {
         var index = master.window_index++;
         window.toString = function(){
-          return "[object Window "+index+"]";
+          // return "[object Window "+index+"]";
+          return "[object Window]";
         };
       };
 

diff --git a/test/data.js b/test/data.js
@@ -6,7 +6,9 @@ url_escaped = "data:text/html,"+escape(doc);
 base64 = "data:text/html;base64,"+Base64.encode(doc);
 debug(url_escaped);
 window.location = "about:blank";
+Envjs.wait();
 window.location = url_escaped;
+Envjs.wait();
 debug(window.document.documentElement.innerHTML);
 if(window.document.documentElement.innerHTML != inner){
   debug(window.document.documentElement.innerHTML);
@@ -15,13 +17,17 @@ if(window.document.documentElement.innerHTML != inner){
 }
 debug(base64);
 window.location = "about:blank";
+Envjs.wait();
 window.location = base64;
+Envjs.wait();
 debug(window.document.documentElement.innerHTML);
 if(window.document.documentElement.innerHTML != inner){
   throw new Error("b"+window.document.documentElement.innerHTML);
 }
 window.location = "about:blank";
+Envjs.wait();
 window.location = "data:,"+escape("Hello, World from a data uri!");
+Envjs.wait();
 debug(window.location+"");
 debug(window.document.documentElement.innerHTML);
 inner = "<head><title></title></head><body>Hello, World from a data uri!</body>";

diff --git a/vendor/johnson b/vendor/johnson