From: jeresig Date: Wed, 6 Jan 2010 15:19:38 +0000 (-0500) Subject: Added in support for content-type sniffing for scripts. Fixes #5718. X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=6861b5d4eb16222ed5ea623af6ce75362b55d1d4;hp=--cc;p=jquery.git Added in support for content-type sniffing for scripts. Fixes #5718. --- 6861b5d4eb16222ed5ea623af6ce75362b55d1d4 diff --git a/src/ajax.js b/src/ajax.js index 6d4026b..9501e8a 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -555,9 +555,8 @@ jQuery.extend({ }, httpData: function( xhr, type, s ) { - var ct = xhr.getResponseHeader("content-type"), - xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0, - json = type === "json" || !type && ct && ct.indexOf("json") >= 0, + var ct = xhr.getResponseHeader("content-type") || "", + xml = type === "xml" || !type && ct.indexOf("xml") >= 0, data = xml ? xhr.responseXML : xhr.responseText; if ( xml && data.documentElement.nodeName === "parsererror" ) { @@ -572,14 +571,13 @@ jQuery.extend({ // The filter can actually parse the response if ( typeof data === "string" ) { - // If the type is "script", eval it in global context - if ( type === "script" ) { + if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) { jQuery.globalEval( data ); } // 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 { data = JSON.parse( data ); diff --git a/test/data/script.php b/test/data/script.php new file mode 100644 index 0000000..55d7bc2 --- /dev/null +++ b/test/data/script.php @@ -0,0 +1,7 @@ + +ok( true, "Script executed correctly." ); diff --git a/test/unit/ajax.js b/test/unit/ajax.js index b1cb486..9b1e323 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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() { expect(5);