un-vendor johnson (pulled in as dependence); window.toString() is now…

… standard [object Window]
smparkes · Feb 6, 2010 · dfb5e51 · dfb5e51
1 parent f623580
commit dfb5e51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 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

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/vendor/johnson b/vendor/johnson