added callback to jQueryify

jsdom · Aug 12, 2010 · 77275a8 · 77275a8
1 parent 824a2f3
commit 77275a8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/lib/jsdom.js b/lib/jsdom.js
@@ -18,20 +18,24 @@ exports.jsdom = function (level) {
 exports.createWindow = function (html, level) {
   var window = exports.jsdom(level).createWindow();
   window.document.innerHTML = html;
-
   return window;
 };
 
-exports.jQueryify = function (html, level, path) {
+exports.jQueryify = function (html, level, path, fn) {
   var window = exports.createWindow(html, level);
 
   var head   = window.document.getElementsByTagName('head')[0],
       jQueryTag = window.document.createElement("script");
 
   path = path ? "file://" + path : 'http://code.jquery.com/jquery-1.4.2.js';
+
   jQueryTag.src = path;
-
-  head.appendChild(jQueryTag);
 
-  return window;
+  jQueryTag.onload = function() {
+    if (this.readyState === 'complete') {
+      if (typeof fn === "function") {
+        fn();
+      }
+    }
+  };
 };
diff --git a/test/jsdom/index.js b/test/jsdom/index.js
@@ -2,8 +2,18 @@ var sys = require("sys");
 exports.tests = {
 
   build_window : function() {
-    sys.debug(sys.inspect(jsdom));
     var window = jsdom.jsdom().createWindow();
     assertNotNull("window must be a new object!", window);
-  }
+  },
+
+  /*
+  Async tests and mjsunit dont play well..
+  jquerify : function() {
+    var window = jsdom.jQueryify("<html><head></head><body><p>it works</p></body></html>", false, false, 
+    function() { 
+      console.dir(window);
+      assertEqual("jquery selectors should work at this point", window.jQuery("p").text(), "it works");
+    });
+  }*/
+
 };