smparkes-envjs 0.0.6 → 0.0.7

data/README

@@ -57,36 +57,48 @@ Installing:
      load('env.rhino.js'); //if in a Rhino script
 
 2) Tell env.js to load an HTML file from your file system that it should model:
-     window.location = "some/file.html";
      Envjs("some/file.html");
+       or
+     var someWindow = window.open("some/file.html");
+       or
+     window.location = "some/file.html";
 
    Optionally you can turn on/off settings by passing an options object:
      Envjs("some/file.html", {log: function(msg){ console.debug(msg) }});
 
 3) Optionally trigger "document ready" events in one of these ways:
 
-   a) standard window.load method:
+4) Start processing of window(s)' event queue:
+     Envjs.wait();
+
+All together, the steps could be:
+
+   a) simplest method:
      load('env.rhino.js');
-     window.location = "some/file.html";
      Envjs("some/file.html");
-    
+     Envjs.wait();
+
    b) jQuery ready method:
      load('env.rhino.js');
      load('jquery-1.3.2.js');
      Envjs("some/file.html");
      load('some-code-that-sets-up-jquery-onready-behaviors.js')
      jQuery.ready();
+     Envjs.wait();
 
    c) Other JavaScript frameworks have their own methods of setup, but the general pattern is:
-     // load env.js
-     // load your framework
-     // tell env.js the base DOM to model
-     // run any setup code for your framework
-     // tell the framework that the document is loaded
-
-4) Invoke the Envjs event loop at the end of your script:
-   Envjs.wait();
-    
+     // step 1: load env.js
+     // optionally: load your framework(s)
+     // step 2: tell env.js the base DOM to model
+     // optionally: run any setup code for your framework(s0
+     // step 3: tell the framework that the document is loaded
+     // step 4: Envjs.wait();
+
+Note that env.js is currently limited to loading a single HTML page
+from the original window.  If you are going to load multiple pages in
+succession into the same window, load the first into a new window
+object using window.open().
+
 Testing jQuery Compatibility:
 * run ./bin/test-jquery.sh 1.3.2
 * run ./bin/test-jquery.sh 1.3.1

data/bin/jquery-1.3.2-test.js

@@ -45,11 +45,12 @@ load("build/runtest/env.js");
                         isStopped = true;
                         unsafeStop.call(this);
                         timeout = ( timeout && timeout > 0 ) ? timeout : 10000;
-	                if (timeout)
-		          config_timeout = setTimeout(function() {
-			    QUnit.ok( false, "Test timed out" );
-			    start();
-		          }, timeout);
+	                /*if (timeout)
+	                  config_timeout = setTimeout(function() {
+        			    QUnit.ok( false, "Test timed out" );
+        			    start();
+        		      }, timeout);*/
+                      $env.wait()
                     }
                 };
                 start = function(){
@@ -60,7 +61,7 @@ load("build/runtest/env.js");
                           clearTimeout(config_timeout);
                           config_timeout = undefined;
                         }
-                      unsafeStart.call(this);
+                        unsafeStart.call(this);
                     }
                 };
                 //we know some ajax calls will fail becuase

data/bin/test-jquery.sh

@@ -42,11 +42,11 @@ cp bin/jquery-$VERSION-test.js $JQUERY_DIR/build/runtest/test.js
 
 if [ $DEBUG -eq 1 ]; then
     echo 'enabling rhino debugger'
-    perl -pi~ -e "s/^JAR(.*)(-jar.*|-cp.*)/JAR\1 -cp \\$\{BUILD_DIR}\/js.jar org.mozilla.javascript.tools.debugger.Main/" $JQUERY_DIR/Makefile;
+    perl -pi~ -e "s/^JAR(.*)(-jar.*|-cp.*)/JAR\1 -cp \\$\{BUILD_DIR}\/js.jar org.mozilla.javascript.tools.debugger.Main -opt -1/" $JQUERY_DIR/Makefile;
 else
     if [ "x$JOHNSON" == "x " ]; then
         echo 'running with rhino'
-        perl -pi~ -e "s/^JAR(.*)(-jar.*|-cp.*)/JAR\1 -cp \\$\{BUILD_DIR}\/js.jar org.mozilla.javascript.tools.envjs.Main/" $JQUERY_DIR/Makefile;
+        perl -pi~ -e "s/^JAR(.*)(-jar.*|-cp.*)/JAR\1 -cp \\$\{BUILD_DIR}\/js.jar org.mozilla.javascript.tools.envjs.Main  -opt -1/" $JQUERY_DIR/Makefile;
     else
         echo 'running with johnson'
         echo > $JQUERY_DIR/build/runtest/env.js