Skip to content
Permalink
Browse files

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

…t7578
  • Loading branch information...
jeresig committed Dec 6, 2010
2 parents df3441b + a2c2d68 commit 54a68fa973564524bdacc2f293d7526a8fd403e7
Showing with 14 additions and 3 deletions.
  1. +1 −1 src/ajax.js
  2. +13 −2 test/unit/ajax.js
@@ -261,7 +261,7 @@ jQuery.extend({
};
}

if ( s.dataType === "script" && s.cache === null ) {
if ( s.dataType === "script" && s.cache === undefined ) {
s.cache = false;
}

@@ -710,10 +710,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
});

test("jQuery.ajax() - JSONP, Local", function() {
expect(8);
expect(9);

var count = 0;
function plus(){ if ( ++count == 8 ) start(); }
function plus(){ if ( ++count == 9 ) start(); }

stop();

@@ -828,6 +828,17 @@ test("jQuery.ajax() - JSONP, Local", function() {
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() {

0 comments on commit 54a68fa

Please sign in to comment.
You can’t perform that action at this time.