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

Script dataType now supports ecmascript mimetypes.

Browse source
This commit is contained in:
jaubourg 2011-01-31 19:14:06 +01:00
parent f286a716d5
commit e0b1bb8e3d
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ajax/script.js
View file

@ -3,10 +3,10 @@
// Install script dataType // Install script dataType
jQuery.ajaxSetup({ jQuery.ajaxSetup({
accepts: { accepts: {
script: "text/javascript, application/javascript" script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
}, },
contents: { contents: {
script: /javascript/ script: /javascript|ecmascript/
}, },
converters: { converters: {
"text script": function( text ) { "text script": function( text ) {

6
test/data/script.php
View file

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

22
test/unit/ajax.js
View file

@ -1558,17 +1558,23 @@ test("jQuery.ajax() - malformed JSON", function() {
}); });
test("jQuery.ajax() - script by content-type", function() { test("jQuery.ajax() - script by content-type", function() {
expect(1); expect(2);
stop(); stop();
jQuery.ajax({ jQuery.when(
url: "data/script.php",
data: { header: "script" }, jQuery.ajax({
success: function() { url: "data/script.php",
start(); data: { header: "script" }
} }),
});
jQuery.ajax({
url: "data/script.php",
data: { header: "ecma" }
})
).then( start, start );
}); });
test("jQuery.ajax() - json by content-type", function() { test("jQuery.ajax() - json by content-type", function() {