Script dataType now supports ecmascript mimetypes.
This commit is contained in:
parent
f286a716d5
commit
e0b1bb8e3d
|
@ -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 ) {
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
if ( $_REQUEST['header'] ) {
|
if ( $_REQUEST['header'] ) {
|
||||||
|
if ( $_REQUEST['header'] == "ecma" ) {
|
||||||
|
header("Content-type: application/ecmascript");
|
||||||
|
} else {
|
||||||
header("Content-type: text/javascript");
|
header("Content-type: text/javascript");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
ok( true, "Script executed correctly." );
|
ok( true, "Script executed correctly." );
|
||||||
|
|
|
@ -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.when(
|
||||||
|
|
||||||
jQuery.ajax({
|
jQuery.ajax({
|
||||||
url: "data/script.php",
|
url: "data/script.php",
|
||||||
data: { header: "script" },
|
data: { header: "script" }
|
||||||
success: function() {
|
}),
|
||||||
start();
|
|
||||||
}
|
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() {
|
||||||
|
|
Loading…
Reference in a new issue