Commit dfa57073 authored by jaubourg's avatar jaubourg

Fix for #7865. Scripts onload handler passes event as first parameter so...

Fix for #7865. Scripts onload handler passes event as first parameter so statusText is now passed as second argument for aborts.
parent 5fd21fc0
......@@ -47,10 +47,9 @@ jQuery.xhr.bindTransport("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.xhr.bindTransport("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.xhr.bindTransport("script", function(s) {
abort: function(statusText) {
if ( script ) {
script.onload(statusText);
script.onload( 0 , statusText );
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment