X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fscript.js;h=37bd85b563b53bd9463abf3da96f346deacd5837;hb=dd5bf421225d23bc8732a92ea82049859c0cd57a;hp=0db0de6c7ef7d56dfc4047018028efd870a249a8;hpb=c43b078c6911027fd4124d542446ad0098662f6a;p=jquery.git diff --git a/src/ajax/script.js b/src/ajax/script.js index 0db0de6..37bd85b 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -1,42 +1,43 @@ (function( jQuery ) { -// Install text to script executor -jQuery.extend( true, jQuery.ajaxSettings , { - +// Install script dataType +jQuery.ajaxSetup({ accepts: { script: "text/javascript, application/javascript" }, - contents: { script: /javascript/ }, - converters: { "text script": jQuery.globalEval } -} ); - -// Bind script tag hack transport -jQuery.ajax.transport("script", function(s) { +}); - // Handle cache special case +// Handle cache's special case and global +jQuery.ajaxPrefilter( "script", function(s) { if ( s.cache === undefined ) { s.cache = false; } + if ( s.crossDomain ) { + s.type = "GET"; + s.global = false; + } +} ); - // This transport only deals with cross domain get requests - if ( s.crossDomain && s.async && ( s.type === "GET" || ! s.data ) ) { +// Bind script tag hack transport +jQuery.ajaxTransport( "script", function(s) { - s.global = false; + // This transport only deals with cross domain requests + if ( s.crossDomain ) { var script, - head = document.getElementsByTagName("head")[0] || document.documentElement; + head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement; return { - send: function(_, callback) { + send: function( _, callback ) { - script = document.createElement("script"); + script = document.createElement( "script" ); script.async = "async"; @@ -47,9 +48,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( _, isAbort ) { - if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) { + if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) { // Handle memory leak in IE script.onload = script.onreadystatechange = null; @@ -59,10 +60,13 @@ jQuery.ajax.transport("script", function(s) { head.removeChild( script ); } - script = 0; + // Dereference the script + script = undefined; - // Callback - callback( statusText ? 0 : 200, statusText || "success" ); + // Callback if not abort + if ( !isAbort ) { + callback( 200, "success" ); + } } }; // Use insertBefore instead of appendChild to circumvent an IE6 bug. @@ -70,13 +74,13 @@ jQuery.ajax.transport("script", function(s) { head.insertBefore( script, head.firstChild ); }, - abort: function(statusText) { + abort: function() { if ( script ) { - script.onload( 0 , statusText ); + script.onload( 0, 1 ); } } }; } -}); +} ); })( jQuery );