Permalink
Browse files

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

  • Loading branch information...
jaubourg committed Jan 29, 2011
1 parent b9f2131 commit 85a195c6d5ad6fccf9dd3df40ebecc338325d461
Showing with 13 additions and 4 deletions.
  1. +4 −1 src/ajax/script.js
  2. +9 −3 test/unit/ajax.js
@@ -9,7 +9,10 @@ jQuery.ajaxSetup({
script: /javascript/
},
converters: {
"text script": jQuery.globalEval
"text script": function( text ) {
jQuery.globalEval( text );
return text;
}
}
});

@@ -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);
}
});
});
});

0 comments on commit 85a195c

Please sign in to comment.