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

Merge branch 'master' of github.com:jquery/jquery into deferred

Browse source
This commit is contained in:
jaubourg 2010-12-30 04:43:31 +01:00
parent 7490eb4f8e dfa5707306
commit 64902e0345
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/transports/script.js
View file

@ -47,10 +47,9 @@ jQuery.ajax.transport("script", function(s) {
script.src = s.url;
// Attach handlers for all browsers
script.onload = script.onreadystatechange = function(statusText) {
script.onload = script.onreadystatechange = function( _ , statusText) {
if ( (!script.readyState ||
script.readyState === "loaded" || script.readyState === "complete") ) {
if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) {
// Handle memory leak in IE
script.onload = script.onreadystatechange = null;
@ -60,10 +59,10 @@ jQuery.ajax.transport("script", function(s) {
head.removeChild( script );
}
script = undefined;
script = 0;
// Callback & dereference
callback(statusText ? 0 : 200, statusText || "success");
// Callback
callback( statusText ? 0 : 200, statusText || "success" );
}
};
// Use insertBefore instead of appendChild to circumvent an IE6 bug.
@ -73,7 +72,7 @@ jQuery.ajax.transport("script", function(s) {
abort: function(statusText) {
if ( script ) {
script.onload(statusText);
script.onload( 0 , statusText );
}
}
};