git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes abort in prefilter. No global event will be fired in that case even if the...
[jquery.git]
/
src
/
ajax
/
script.js
diff --git
a/src/ajax/script.js
b/src/ajax/script.js
index
dfee867
..
34ddd04
100644
(file)
--- a/
src/ajax/script.js
+++ b/
src/ajax/script.js
@@
-3,13
+3,16
@@
// Install script dataType
jQuery.ajaxSetup({
accepts: {
// Install script dataType
jQuery.ajaxSetup({
accepts: {
- script: "text/javascript, application/javascript"
+ script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
},
contents: {
},
contents: {
- script: /javascript/
+ script: /javascript|ecmascript/
},
converters: {
},
converters: {
- "text script": jQuery.globalEval
+ "text script": function( text ) {
+ jQuery.globalEval( text );
+ return text;
+ }
}
});
}
});
@@
-31,7
+34,7
@@
jQuery.ajaxTransport( "script", function(s) {
if ( s.crossDomain ) {
var script,
if ( s.crossDomain ) {
var script,
- head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement;
+ head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
return {
return {