X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=aa6275410afc25647a259770bb630b1eb085574e;hb=257eaf7ee32df66ddd0a3333a5b6a829b9d388ef;hp=fa047188aed2befd0b164cc82fa713c3110e2842;hpb=c47f6f8f523c8add478fbf5570a67015426f5b86;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index fa04718..aa62754 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -15,6 +15,7 @@ jQuery.fn.extend({ * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself). * @cat Ajax */ + // DEPRECATED loadIfModified: function( url, params, callback ) { this.load( url, params, callback, 1 ); }, @@ -77,9 +78,12 @@ jQuery.fn.extend({ complete: function(res, status){ // If successful, inject the HTML into all the matched elements if ( status == "success" || !ifModified && status == "notmodified" ) - self.html(res.responseText) + self.html(res.responseText); - self.each( callback, [res.responseText, status, res] ); + // Add delay to account for Safari's delay in globalEval + setTimeout(function(){ + self.each( callback, [res.responseText, status, res] ); + }, 13); } }); return this; @@ -106,7 +110,12 @@ jQuery.fn.extend({ */ serialize: function() { return jQuery.param( this ); - } + }, + + // DEPRECATED + // This method no longer does anything - all script evaluation is + // taken care of within the HTML injection methods. + evalScripts: function(){} }); @@ -294,6 +303,7 @@ jQuery.extend({ * @param Function callback (optional) A function to be executed whenever the data is loaded successfully. * @cat Ajax */ + // DEPRECATED getIfModified: function( url, data, callback, type ) { return jQuery.get(url, data, callback, type, 1); }, @@ -406,6 +416,7 @@ jQuery.extend({ * @param Number time How long before an AJAX request times out, in milliseconds. * @cat Ajax */ + // DEPRECATED ajaxTimeout: function( timeout ) { jQuery.ajaxSettings.timeout = timeout; }, @@ -570,18 +581,21 @@ jQuery.extend({ * @see ajaxSetup(Map) */ ajax: function( s ) { - // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout - s = jQuery.extend({}, jQuery.ajaxSettings, s); + // Extend the settings, but re-extend 's' so that it can be + // checked again later (in the test suite, specifically) + s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); // if data available if ( s.data ) { // convert data if not already a string - if (s.processData && typeof s.data != "string") - s.data = jQuery.param(s.data); + if ( s.processData && typeof s.data != "string" ) + s.data = jQuery.param(s.data); + // append data to url for get requests - if( s.type.toLowerCase() == "get" ) { + if ( s.type.toLowerCase() == "get" ) { // "?" + data or "&" + data (in case there are already params) - s.url += ((s.url.indexOf("?") > -1) ? "&" : "?") + s.data; + s.url += (s.url.indexOf("?") > -1 ? "&" : "?") + s.data; + // IE likes to send both get and post data, prevent this s.data = null; } @@ -622,7 +636,7 @@ jQuery.extend({ // Wait for a response to come back var onreadystatechange = function(isTimeout){ // The transfer is complete and the data is available, or the request timed out - if ( xml && (xml.readyState == 4 || isTimeout == "timeout") ) { + if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) { requestDone = true; // clear poll interval @@ -631,40 +645,41 @@ jQuery.extend({ ival = null; } - var status; - try { - status = isTimeout == "timeout" && "timeout" || - !jQuery.httpSuccess( xml ) && "error" || - s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" || - "success"; - - // Make sure that the request was successful or notmodified - if ( status != "error" && status != "timeout" ) { - // Cache Last-Modified header, if ifModified mode. - var modRes; - try { - modRes = xml.getResponseHeader("Last-Modified"); - } catch(e) {} // swallow exception thrown by FF if header is not available - - if ( s.ifModified && modRes ) - jQuery.lastModified[s.url] = modRes; - + var status = isTimeout == "timeout" && "timeout" || + !jQuery.httpSuccess( xml ) && "error" || + s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" || + "success"; + + if ( status == "success" ) { + // Watch for, and catch, XML document parse errors + try { // process the data (runs the xml through httpData regardless of callback) var data = jQuery.httpData( xml, s.dataType ); + } catch(e) { + status = "parsererror"; + } + } + + // Make sure that the request was successful or notmodified + if ( status == "success" ) { + // Cache Last-Modified header, if ifModified mode. + var modRes; + try { + modRes = xml.getResponseHeader("Last-Modified"); + } catch(e) {} // swallow exception thrown by FF if header is not available - // If a local callback was specified, fire it and pass it the data - if ( s.success ) - s.success( data, status ); + if ( s.ifModified && modRes ) + jQuery.lastModified[s.url] = modRes; - // Fire the global callback - if( s.global ) - jQuery.event.trigger( "ajaxSuccess", [xml, s] ); - } else - jQuery.handleError(s, xml, status); - } catch(e) { - status = "error"; - jQuery.handleError(s, xml, status, e); - } + // If a local callback was specified, fire it and pass it the data + if ( s.success ) + s.success( data, status ); + + // Fire the global callback + if ( s.global ) + jQuery.event.trigger( "ajaxSuccess", [xml, s] ); + } else + jQuery.handleError(s, xml, status); // The request was completed if( s.global ) @@ -684,21 +699,23 @@ jQuery.extend({ } }; - // don't attach the handler to the request, just poll it instead - var ival = setInterval(onreadystatechange, 13); - - // Timeout checker - if ( s.timeout > 0 ) - setTimeout(function(){ - // Check to see if the request is still happening - if ( xml ) { - // Cancel the request - xml.abort(); - - if( !requestDone ) - onreadystatechange( "timeout" ); - } - }, s.timeout); + if ( s.async ) { + // don't attach the handler to the request, just poll it instead + var ival = setInterval(onreadystatechange, 13); + + // Timeout checker + if ( s.timeout > 0 ) + setTimeout(function(){ + // Check to see if the request is still happening + if ( xml ) { + // Cancel the request + xml.abort(); + + if( !requestDone ) + onreadystatechange( "timeout" ); + } + }, s.timeout); + } // Send the data try { @@ -757,12 +774,15 @@ jQuery.extend({ */ httpData: function( r, type ) { var ct = r.getResponseHeader("content-type"); - var data = !type && ct && ct.indexOf("xml") >= 0; - data = type == "xml" || data ? r.responseXML : r.responseText; + var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0; + data = xml ? r.responseXML : r.responseText; + + if ( xml && data.documentElement.tagName == "parsererror" ) + throw "parsererror"; // If the type is "script", eval it in global context if ( type == "script" ) - (new Function( data ))(); + jQuery.globalEval( data ); // Get the JavaScript object, if JSON is used. if ( type == "json" )