git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
df3441b
)
Merge branch 't7578' of https://github.com/jitter/jquery into jitter-t7578
author
John Resig
<jeresig@gmail.com>
Mon, 6 Dec 2010 22:06:26 +0000
(17:06 -0500)
committer
John Resig
<jeresig@gmail.com>
Mon, 6 Dec 2010 22:06:26 +0000
(17:06 -0500)
src/ajax.js
patch
|
blob
|
history
test/unit/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
d10b931
..
e82a082
100644
(file)
--- a/
src/ajax.js
+++ b/
src/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;
}
diff --git
a/test/unit/ajax.js
b/test/unit/ajax.js
index
4ce14c2
..
9e6f32d
100644
(file)
--- a/
test/unit/ajax.js
+++ b/
test/unit/ajax.js
@@
-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() {