Merge branch 'master' of github.com:jquery/jquery

This commit is contained in:
Brandon Aaron 2010-03-27 18:58:55 -05:00
commit d6f03aa0df
4 changed files with 43 additions and 18 deletions

View file

@ -7,5 +7,9 @@ jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
if ( !url || url.indexOf("http") !== 0 ) {
return;
}
// (Temporarily) Disable Ajax tests to reduce network strain
isLocal = QUnit.isLocal = true;
document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
})();