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

Added in support for content-type sniffing for scripts. Fixes #5718.

Browse source
This commit is contained in:
jeresig 2010-01-06 10:19:38 -05:00
parent 787f271052
commit 6861b5d4eb
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ajax.js
View file

@ -555,9 +555,8 @@ jQuery.extend({
}, },
httpData: function( xhr, type, s ) { httpData: function( xhr, type, s ) {
var ct = xhr.getResponseHeader("content-type"), var ct = xhr.getResponseHeader("content-type") || "",
xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0, xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
json = type === "json" || !type && ct && ct.indexOf("json") >= 0,
data = xml ? xhr.responseXML : xhr.responseText; data = xml ? xhr.responseXML : xhr.responseText;
if ( xml && data.documentElement.nodeName === "parsererror" ) { if ( xml && data.documentElement.nodeName === "parsererror" ) {
@ -572,14 +571,13 @@ jQuery.extend({
// The filter can actually parse the response // The filter can actually parse the response
if ( typeof data === "string" ) { if ( typeof data === "string" ) {
// If the type is "script", eval it in global context // If the type is "script", eval it in global context
if ( type === "script" ) { if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
jQuery.globalEval( data ); jQuery.globalEval( data );
} }
// Get the JavaScript object, if JSON is used. // Get the JavaScript object, if JSON is used.
if ( json ) { if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
// Try to use the native JSON parser first // Try to use the native JSON parser first
try { try {
data = JSON.parse( data ); data = JSON.parse( data );

7
test/data/script.php Normal file
View file

@ -0,0 +1,7 @@
<?php
error_reporting(0);
if ( $_REQUEST['header'] ) {
header("Content-type: text/javascript");
}
?>
ok( true, "Script executed correctly." );

14
test/unit/ajax.js
View file

@ -797,6 +797,20 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
}); });
}); });
test("jQuery.ajax() - script by content-type", function() {
expect(1);
stop();
jQuery.ajax({
url: "data/script.php",
data: { header: "script" },
success: function() {
start();
}
});
});
test("jQuery.ajax() - json by content-type", function() { test("jQuery.ajax() - json by content-type", function() {
expect(5); expect(5);