Script dataType now supports ecmascript mimetypes.

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

View file

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

View file

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

View file

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