From: jaubourg <j@ubourg.net>
Date: Sat, 29 Jan 2011 00:39:22 +0000 (+0100)
Subject: Fixes #8082. Text to script converter now returns text. Unit test added.
X-Git-Tag: 1.5~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=85a195c6d5ad6fccf9dd3df40ebecc338325d461;p=jquery.git

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 dfee86712..91c84d6f4 100644
--- 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 2624b5583..deef6360b 100644
--- 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);
+			}
+		});
 	});
 });