Script dataType now supports ecmascript mimetypes.

diff --git a/src/ajax/script.js b/src/ajax/script.js
index 91c84d6..731f5b6 100644 (file)
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -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 ) {

diff --git a/test/data/script.php b/test/data/script.php
index 55d7bc2..fb71104 100644 (file)
--- a/test/data/script.php
+++ b/test/data/script.php
@@ -1,7 +1,11 @@
 <?php
 error_reporting(0);
 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." );

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 31b319c..33f2782 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1558,17 +1558,23 @@ test("jQuery.ajax() - malformed JSON", function() {
 });
 
 test("jQuery.ajax() - script by content-type", function() {
-       expect(1);
+       expect(2);
 
        stop();
 
-       jQuery.ajax({
-               url: "data/script.php",
-               data: { header: "script" },
-               success: function() {
-                       start();
-               }
-       });
+       jQuery.when(
+
+               jQuery.ajax({
+                       url: "data/script.php",
+                       data: { header: "script" }
+               }),
+
+               jQuery.ajax({
+                       url: "data/script.php",
+                       data: { header: "ecma" }
+               })
+
+       ).then( start, start );
 });
 
 test("jQuery.ajax() - json by content-type", function() {