aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2011-01-29 01:39:22 +0100
committerjaubourg <j@ubourg.net>2011-01-29 01:39:22 +0100
commit85a195c6d5ad6fccf9dd3df40ebecc338325d461 (patch)
treed201d7e63bf2c80e725e86e3a6eb529ddbe6c6ff
parentb9f2131a9da53fff60549e87428a0efe43f9e80a (diff)
downloadjquery-85a195c6d5ad6fccf9dd3df40ebecc338325d461.tar.gz
jquery-85a195c6d5ad6fccf9dd3df40ebecc338325d461.zip
Fixes #8082. Text to script converter now returns text. Unit test added.
-rw-r--r--src/ajax/script.js5
-rw-r--r--test/unit/ajax.js12
2 files changed, 13 insertions, 4 deletions
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);
+ }
+ });
});
});