Fixes #8082. Text to script converter now returns text. Unit test added.

diff --git a/src/ajax/script.js b/src/ajax/script.js
index dfee86712fde9eae00a27bcda5e3ab9746ec59aa..91c84d6f41d540ab96e171012ffa0aa59d258126 100644 (file)
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -9,7 +9,10 @@ jQuery.ajaxSetup({
                script: /javascript/
        },
        converters: {
-               "text script": jQuery.globalEval
+               "text script": function( text ) {
+                       jQuery.globalEval( text );
+                       return text;
+               }
        }
 });
 

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 2624b5583f8a8cb46464976eeb47366b64b2ebb4..deef6360b0e82415d2055c702a15f519e6f397e7 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1192,11 +1192,17 @@ test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", f
 });
 
 test("jQuery.getScript(String, Function) - with callback", function() {
-       expect(2);
+       expect(3);
        stop();
-       jQuery.getScript(url("data/test.js"), function() {
+       jQuery.getScript(url("data/test.js"), function( data ) {
                equals( foobar, "bar", 'Check if script was evaluated' );
-               setTimeout(start, 100);
+               jQuery.ajax(url("data/test.js"), {
+                       dataType: "text",
+                       success: function( dataText ) {
+                               strictEqual( data, dataText, "Same-domain script requests returns the source of the script (#8082)" );
+                               setTimeout(start, 100);
+                       }
+               });
        });
 });