deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 't7578' of https://github.com/jitter/jquery into jitter-t7578

Browse source
This commit is contained in:
John Resig 2010-12-06 17:06:26 -05:00
parent df3441bac7 a2c2d68d7f
commit 54a68fa973
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ajax.js
View file

@ -261,7 +261,7 @@ jQuery.extend({
}; };
} }
if ( s.dataType === "script" && s.cache === null ) { if ( s.dataType === "script" && s.cache === undefined ) {
s.cache = false; s.cache = false;
} }

15
test/unit/ajax.js
View file

@ -710,10 +710,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
}); });
test("jQuery.ajax() - JSONP, Local", function() { test("jQuery.ajax() - JSONP, Local", function() {
expect(8); expect(9);
var count = 0; var count = 0;
function plus(){ if ( ++count == 8 ) start(); } function plus(){ if ( ++count == 9 ) start(); }
stop(); stop();
@ -828,6 +828,17 @@ test("jQuery.ajax() - JSONP, Local", function() {
plus(); plus();
} }
}); });
//#7578
jQuery.ajax({
url: "data/jsonp.php",
dataType: "jsonp",
beforeSend: function(){
strictEqual( this.cache, false, "cache must be false on JSON request" );
plus();
return false;
}
});
}); });
test("JSONP - Custom JSONP Callback", function() { test("JSONP - Custom JSONP Callback", function() {