Commit 32f688d3 authored by Jörn Zaefferer's avatar Jörn Zaefferer

Simplified check for XMLHttpRequest (saving a few bytes) and fixed load()-test

parent b98898d9
...@@ -132,7 +132,7 @@ jQuery.fn.extend({ ...@@ -132,7 +132,7 @@ jQuery.fn.extend({
}); });
// If IE is used, create a wrapper for the XMLHttpRequest object // If IE is used, create a wrapper for the XMLHttpRequest object
if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" ) if ( !window.XMLHttpRequest )
XMLHttpRequest = function(){ XMLHttpRequest = function(){
return new ActiveXObject("Microsoft.XMLHTTP"); return new ActiveXObject("Microsoft.XMLHTTP");
}; };
......
...@@ -70,8 +70,8 @@ test("load(String, Object, Function) - inject without callback", function() { ...@@ -70,8 +70,8 @@ test("load(String, Object, Function) - inject without callback", function() {
test("load(String, Object, Function) - check scripts", function() { test("load(String, Object, Function) - check scripts", function() {
expect(7); expect(7);
stop(); stop();
var testFoo = undefined; window.testFoo = undefined;
foobar = null; window.foobar = null;
var verifyEvaluation = function() { var verifyEvaluation = function() {
ok( foobar == "bar", 'Check if script src was evaluated after load' ); ok( foobar == "bar", 'Check if script src was evaluated after load' );
ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM'); ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment