deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
jaubourg 2011-01-29 01:39:22 +01:00
parent b9f2131a9d
commit 85a195c6d5
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ajax/script.js
View file

@ -9,7 +9,10 @@ jQuery.ajaxSetup({
script: /javascript/ script: /javascript/
}, },
converters: { converters: {
"text script": jQuery.globalEval "text script": function( text ) {
jQuery.globalEval( text );
return text;
}
} }
}); });

10
test/unit/ajax.js
View file

@ -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() { test("jQuery.getScript(String, Function) - with callback", function() {
expect(2); expect(3);
stop(); stop();
jQuery.getScript(url("data/test.js"), function() { jQuery.getScript(url("data/test.js"), function( data ) {
equals( foobar, "bar", 'Check if script was evaluated' ); equals( foobar, "bar", 'Check if script was evaluated' );
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); setTimeout(start, 100);
}
});
}); });
}); });