git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9f2131
)
Fixes #8082. Text to script converter now returns text. Unit test added.
author
jaubourg
<j@ubourg.net>
Sat, 29 Jan 2011 00:39:22 +0000
(
01:39
+0100)
committer
jaubourg
<j@ubourg.net>
Sat, 29 Jan 2011 00:39:22 +0000
(
01:39
+0100)
src/ajax/script.js
patch
|
blob
|
history
test/unit/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax/script.js
b/src/ajax/script.js
index
dfee867
..
91c84d6
100644
(file)
--- a/
src/ajax/script.js
+++ b/
src/ajax/script.js
@@
-9,7
+9,10
@@
jQuery.ajaxSetup({
script: /javascript/
},
converters: {
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
2624b55
..
deef636
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() {
});
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' );
- 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);
+ }
+ });
});
});
});
});