X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=0b965e4a1628bbde8f67f3b18e686d2af359e47e;hb=a5dbcaf67579b2266b64ffbdd2a328d180f7f64b;hp=953876a1937e560847e685e1be70a7a19ed6eb1d;hpb=c330527318775d32c87954f640c53066e7a732d9;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 953876a..0b965e4 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -13,8 +13,9 @@ jQuery.fn.extend({
 	 * @param String url The URL of the HTML file to load.
 	 * @param Map params (optional) Key/value pairs that will be sent to the server.
 	 * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself).
-	 * @cat AJAX
+	 * @cat Ajax
 	 */
+	// DEPRECATED
 	loadIfModified: function( url, params, callback ) {
 		this.load( url, params, callback, 1 );
 	},
@@ -41,21 +42,27 @@ jQuery.fn.extend({
 	 * @param String url The URL of the HTML file to load.
 	 * @param Object params (optional) A set of key/value pairs that will be sent as data to the server.
 	 * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself).
-	 * @cat AJAX
+	 * @cat Ajax
 	 */
 	load: function( url, params, callback, ifModified ) {
-		if ( url.constructor == Function )
+		if ( jQuery.isFunction( url ) )
 			return this.bind("load", url);
 
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
 		callback = callback || function(){};
 
 		// Default to a GET request
 		var type = "GET";
 
 		// If the second parameter was provided
-		if ( params ) {
+		if ( params )
 			// If it's a function
-			if ( params.constructor == Function ) {
+			if ( jQuery.isFunction( params ) ) {
 				// We assume that it's the callback
 				callback = params;
 				params = null;
@@ -65,7 +72,6 @@ jQuery.fn.extend({
 				params = jQuery.param( params );
 				type = "POST";
 			}
-		}
 
 		var self = this;
 
@@ -76,15 +82,26 @@ jQuery.fn.extend({
 			data: params,
 			ifModified: ifModified,
 			complete: function(res, status){
-				if ( status == "success" || !ifModified && status == "notmodified" ) {
-					// Inject the HTML into all the matched elements
-					self.html(res.responseText)
-					  // Execute all the scripts inside of the newly-injected HTML
-					  .evalScripts()
-					  // Execute callback
-					  .each( callback, [res.responseText, status, res] );
-				} else
-					callback.apply( self, [res.responseText, status, res] );
+				// If successful, inject the HTML into all the matched elements
+				if ( status == "success" || !ifModified && status == "notmodified" )
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div/>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+
+				// Add delay to account for Safari's delay in globalEval
+				setTimeout(function(){
+					self.each( callback, [res.responseText, status, res] );
+				}, 13);
 			}
 		});
 		return this;
@@ -95,50 +112,31 @@ jQuery.fn.extend({
 	 * This will serialize all given elements.
 	 *
 	 * A serialization similar to the form submit of a browser is
-	 * provided by the form plugin. It also takes multiple-selects 
+	 * provided by the [http://www.malsup.com/jquery/form/ Form Plugin].
+	 * It also takes multiple-selects 
 	 * into account, while this method recognizes only a single option.
 	 *
 	 * @example $("input[@type=text]").serialize();
 	 * @before <input type='text' name='name' value='John'/>
 	 * <input type='text' name='location' value='Boston'/>
-	 * @after name=John&location=Boston
+	 * @after name=John&amp;location=Boston
 	 * @desc Serialize a selection of input elements to a string
 	 *
 	 * @name serialize
 	 * @type String
-	 * @cat AJAX
+	 * @cat Ajax
 	 */
 	serialize: function() {
 		return jQuery.param( this );
 	},
 
-	/**
-	 * Evaluate all script tags inside this jQuery. If they have a src attribute,
-	 * the script is loaded, otherwise it's content is evaluated.
-	 *
-	 * @name evalScripts
-	 * @type jQuery
-	 * @private
-	 * @cat AJAX
-	 */
-	evalScripts: function() {
-		return this.find('script').each(function(){
-			if ( this.src )
-				jQuery.getScript( this.src );
-			else {
-				jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-			}
-		}).end();
-	}
+	// DEPRECATED
+	// This method no longer does anything - all script evaluation is
+	// taken care of within the HTML injection methods.
+	evalScripts: function(){}
 
 });
 
-// If IE is used, create a wrapper for the XMLHttpRequest object
-if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
-	XMLHttpRequest = function(){
-		return new ActiveXObject("Microsoft.XMLHTTP");
-	};
-
 // Attach a bunch of functions for handling common AJAX events
 
 /**
@@ -154,7 +152,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @name ajaxStart
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
 
 /**
@@ -168,7 +166,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @name ajaxStop
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
 
 /**
@@ -185,7 +183,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @name ajaxComplete
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
 
 /**
@@ -203,7 +201,7 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @name ajaxSuccess
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
 
 /**
@@ -221,11 +219,11 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @name ajaxError
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
  
 /**
- * Attach a function to be executed before an AJAX request is send.
+ * Attach a function to be executed before an AJAX request is sent.
  *
  * The XMLHttpRequest and settings used for that request are passed
  * as arguments to the callback.
@@ -233,12 +231,12 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  * @example $("#msg").ajaxSend(function(request, settings){
  *   $(this).append("<li>Starting request at " + settings.url + "</li>");
  * });
- * @desc Show a message before an AJAX request is send.
+ * @desc Show a message before an AJAX request is sent.
  *
  * @name ajaxSend
  * @type jQuery
  * @param Function callback The function to execute.
- * @cat AJAX
+ * @cat Ajax
  */
 jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
 	jQuery.fn[o] = function(f){
@@ -246,11 +244,20 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
 	};
 });
 
+var jsc = (new Date).getTime();
+
 jQuery.extend({
 
 	/**
 	 * Load a remote page using an HTTP GET request.
 	 *
+	 * This is an easy way to send a simple GET request to a server
+	 * without having to use the more complex $.ajax function. It
+	 * allows a single callback function to be specified that will
+	 * be executed when the request is complete (and only if the response
+	 * has a successful response code). If you need to have both error
+	 * and success callbacks, you may want to use $.ajax.
+	 *
 	 * @example $.get("test.cgi");
 	 *
 	 * @example $.get("test.cgi", { name: "John", time: "2pm" } );
@@ -270,16 +277,18 @@ jQuery.extend({
 	 * @type XMLHttpRequest
 	 * @param String url The URL of the page to load.
 	 * @param Map params (optional) Key/value pairs that will be sent to the server.
-	 * @param Function callback (optional) A function to be executed whenever the data is loaded.
-	 * @cat AJAX
+	 * @param Function callback (optional) A function to be executed whenever the data is loaded successfully.
+	 * @cat Ajax
 	 */
 	get: function( url, data, callback, type, ifModified ) {
 		// shift arguments if data argument was ommited
-		if ( data && data.constructor == Function ) {
+		if ( jQuery.isFunction( data ) ) {
 			callback = data;
 			data = null;
 		}
+		
 		return jQuery.ajax({
+			type: "GET",
 			url: url,
 			data: data,
 			success: callback,
@@ -311,9 +320,10 @@ jQuery.extend({
 	 * @type XMLHttpRequest
 	 * @param String url The URL of the page to load.
 	 * @param Map params (optional) Key/value pairs that will be sent to the server.
-	 * @param Function callback (optional) A function to be executed whenever the data is loaded.
-	 * @cat AJAX
+	 * @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);
 	},
@@ -321,7 +331,7 @@ jQuery.extend({
 	/**
 	 * Loads, and executes, a remote JavaScript file using an HTTP GET request.
 	 *
-	 * Warning: Safari <= 2.0.x is unable to evalulate scripts in a global
+	 * Warning: Safari <= 2.0.x is unable to evaluate scripts in a global
 	 * context synchronously. If you load functions via getScript, make sure
 	 * to call them after a delay.
 	 *
@@ -334,8 +344,8 @@ jQuery.extend({
 	 * @name $.getScript
 	 * @type XMLHttpRequest
 	 * @param String url The URL of the page to load.
-	 * @param Function callback (optional) A function to be executed whenever the data is loaded.
-	 * @cat AJAX
+	 * @param Function callback (optional) A function to be executed whenever the data is loaded successfully.
+	 * @cat Ajax
 	 */
 	getScript: function( url, callback ) {
 		return jQuery.get(url, null, callback, "script");
@@ -359,8 +369,8 @@ jQuery.extend({
 	 * @type XMLHttpRequest
 	 * @param String url The URL of the page to load.
 	 * @param Map params (optional) Key/value pairs that will be sent to the server.
-	 * @param Function callback A function to be executed whenever the data is loaded.
-	 * @cat AJAX
+	 * @param Function callback A function to be executed whenever the data is loaded successfully.
+	 * @cat Ajax
 	 */
 	getJSON: function( url, data, callback ) {
 		return jQuery.get(url, data, callback, "json");
@@ -388,10 +398,15 @@ jQuery.extend({
 	 * @type XMLHttpRequest
 	 * @param String url The URL of the page to load.
 	 * @param Map params (optional) Key/value pairs that will be sent to the server.
-	 * @param Function callback (optional) A function to be executed whenever the data is loaded.
-	 * @cat AJAX
+	 * @param Function callback (optional) A function to be executed whenever the data is loaded successfully.
+	 * @cat Ajax
 	 */
 	post: function( url, data, callback, type ) {
+		if ( jQuery.isFunction( data ) ) {
+			callback = data;
+			data = {};
+		}
+
 		return jQuery.ajax({
 			type: "POST",
 			url: url,
@@ -401,11 +416,8 @@ jQuery.extend({
 		});
 	},
 
-	// timeout (ms)
-	//timeout: 0,
-
 	/**
-	 * Set the timeout of all AJAX requests to a specific amount of time.
+	 * Set the timeout in milliseconds of all AJAX requests to a specific amount of time.
 	 * This will make all future AJAX requests timeout after a specified amount
 	 * of time.
 	 *
@@ -421,10 +433,11 @@ jQuery.extend({
 	 *
 	 * @name $.ajaxTimeout
 	 * @type undefined
-	 * @param Number time How long before an AJAX request times out.
-	 * @cat AJAX
+	 * @param Number time How long before an AJAX request times out, in milliseconds.
+	 * @cat Ajax
 	 */
-	ajaxTimeout: function(timeout) {
+	// DEPRECATED
+	ajaxTimeout: function( timeout ) {
 		jQuery.ajaxSettings.timeout = timeout;
 	},
 	
@@ -446,10 +459,10 @@ jQuery.extend({
 	 * @name $.ajaxSetup
 	 * @type undefined
 	 * @param Map settings Key/value pairs to use for all AJAX requests
-	 * @cat AJAX
+	 * @cat Ajax
 	 */
-	ajaxSetup: function(settings) {
-		jQuery.extend(jQuery.ajaxSettings, settings);
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {
@@ -458,7 +471,8 @@ jQuery.extend({
 		timeout: 0,
 		contentType: "application/x-www-form-urlencoded",
 		processData: true,
-		async: true
+		async: true,
+		data: null
 	},
 	
 	// Last-Modified header cache for next request
@@ -468,15 +482,17 @@ jQuery.extend({
 	 * Load a remote page using an HTTP request.
 	 *
 	 * This is jQuery's low-level AJAX implementation. See $.get, $.post etc. for
-	 * higher-level abstractions.
+	 * higher-level abstractions that are often easier to understand and use,
+	 * but don't offer as much functionality (such as error callbacks).
 	 *
 	 * $.ajax() returns the XMLHttpRequest that it creates. In most cases you won't
 	 * need that object to manipulate directly, but it is available if you need to
 	 * abort the request manually.
 	 *
-	 * Note: Make sure the server sends the right mimetype (eg. xml as
-	 * "text/xml"). Sending the wrong mimetype will get you into serious
-	 * trouble that jQuery can't solve.
+	 * '''Note:''' If you specify the dataType option described below, make sure
+	 * the server sends the correct MIME type in the response (eg. xml as "text/xml").
+	 * Sending the wrong MIME type can lead to unexpected problems in your script.
+	 * See [[Specifying the Data Type for AJAX Requests]] for more information.
 	 *
 	 * Supported datatypes are (see dataType option):
 	 *
@@ -504,7 +520,7 @@ jQuery.extend({
 	 * response has changed since the last request. This is done by checking the
 	 * Last-Modified header. Default value is false, ignoring the header.
 	 *
-	 * (Number) timeout - Local timeout to override global timeout, eg. to give a
+	 * (Number) timeout - Local timeout in milliseconds to override global timeout, eg. to give a
 	 * single request a longer timeout while all others timeout after 1 second.
 	 * See $.ajaxTimeout() for global timeouts.
 	 *
@@ -537,7 +553,7 @@ jQuery.extend({
 	 * the default content-type "application/x-www-form-urlencoded". If you want to send
 	 * DOMDocuments, set this option to false.
 	 *
-	 * (Boolean) async - By default, all requests are send asynchronous (set to true).
+	 * (Boolean) async - By default, all requests are sent asynchronous (set to true).
 	 * If you need synchronous requests, set this option to false.
 	 *
 	 * (Function) beforeSend - A pre-callback to set custom headers etc., the
@@ -565,8 +581,8 @@ jQuery.extend({
 	 *  async: false
 	 * }).responseText;
 	 * @desc Loads data synchronously. Blocks the browser while the requests is active.
-	 * It is better to block user interaction with others means when synchronization is
-	 * necessary, instead to block the complete browser.
+	 * It is better to block user interaction by other means when synchronization is
+	 * necessary.
 	 *
 	 * @example var xmlDocument = [create xml document];
 	 * $.ajax({
@@ -581,32 +597,104 @@ jQuery.extend({
 	 * @name $.ajax
 	 * @type XMLHttpRequest
 	 * @param Map properties Key/value pairs to initialize the request with.
-	 * @cat AJAX
+	 * @cat Ajax
 	 * @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);
-
-		// 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);
-			// append data to url for get requests
-			if( s.type.toLowerCase() == "get" )
-				// "?" + data or "&" + data (in case there are already params)
-				s.url += ((s.url.indexOf("?") > -1) ? "&" : "?") + s.data;
+		var jsonp, jsre = /=(\?|%3F)/g, status, data;
+
+		// 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));
+
+		// convert data if not already a string
+		if ( s.data && s.processData && typeof s.data != "string" )
+			s.data = jQuery.param(s.data);
+
+		// Break the data into one single string
+		var q = s.url.indexOf("?");
+		if ( q > -1 ) {
+			s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
+			s.url = s.url.slice(0, q);
+		}
+
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType == "jsonp" ) {
+			if ( !s.data || !s.data.match(jsre) )
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType == "json" && s.data && s.data.match(jsre) ) {
+			jsonp = "jsonp" + jsc++;
+			s.data = s.data.replace(jsre, "=" + jsonp);
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			window[ jsonp ] = function(tmp){
+				data = tmp;
+				success();
+				// Garbage collect
+				window[ jsonp ] = undefined;
+				try{ delete window[ jsonp ]; } catch(e){}
+			};
+		}
+
+		if ( s.dataType == "script" && s.cache == null )
+			s.cache = false;
+
+		if ( s.cache === false && s.type.toLowerCase() == "get" )
+			s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+
+		// If data is available, append data to url for get requests
+		if ( s.data && s.type.toLowerCase() == "get" ) {
+			s.url += "?" + s.data;
+
+			// IE likes to send both get and post data, prevent this
+			s.data = null;
 		}
 
 		// Watch for a new set of requests
 		if ( s.global && ! jQuery.active++ )
 			jQuery.event.trigger( "ajaxStart" );
 
+		// If we're requesting a remote document
+		// and trying to load JSON or Script
+		if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+			var script = document.createElement("script");
+			script.src = s.url;
+
+			// Handle Script loading
+			if ( !jsonp && (s.success || s.complete) ) {
+				var done = false;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function(){
+					if ( !done && (!this.readyState || 
+							this.readyState == "loaded" || this.readyState == "complete") ) {
+						done = true;
+						success();
+						complete();
+						document.body.removeChild( script );
+					}
+				};
+			}
+
+			document.body.appendChild(script);
+
+			// We handle everything using the script element injection
+			return;
+		}
+
 		var requestDone = false;
 
-		// Create the request object
-		var xml = new XMLHttpRequest();
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 
 		// Open the socket
 		xml.open(s.type, s.url, s.async);
@@ -623,109 +711,129 @@ jQuery.extend({
 		// Set header so the called script knows that it's an XMLHttpRequest
 		xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 
-		// Make sure the browser sends the right content length
-		if ( xml.overrideMimeType )
-			xml.setRequestHeader("Connection", "close");
-			
 		// Allow custom headers/mimetypes
-		if( s.beforeSend )
+		if ( s.beforeSend )
 			s.beforeSend(xml);
-		if (s.global)
+			
+		if ( s.global )
 		    jQuery.event.trigger("ajaxSend", [xml, s]);
 
 		// 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;
-				var status;
-				try {
-					status = jQuery.httpSuccess( xml ) && isTimeout != "timeout" ?
-						s.ifModified && jQuery.httpNotModified( xml, s.url ) ? "notmodified" : "success" : "error";
-					// Make sure that the request was successful or notmodified
-					if ( status != "error" ) {
-						// 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;
-	
+				
+				// clear poll interval
+				if (ival) {
+					clearInterval(ival);
+					ival = null;
+				}
+				
+				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 );
-	
-						// 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);
+						data = jQuery.httpData( xml, s.dataType );
+					} catch(e) {
+						status = "parsererror";
 					}
-				} catch(e) {
-					status = "error";
-					jQuery.handleError(s, xml, status, e);
 				}
 
-				// The request was completed
-				if( s.global )
-					jQuery.event.trigger( "ajaxComplete", [xml, s] );
+				// 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 ( s.ifModified && modRes )
+						jQuery.lastModified[s.url] = modRes;
 
-				// Handle the global AJAX counter
-				if ( s.global && ! --jQuery.active )
-					jQuery.event.trigger( "ajaxStop" );
+					// JSONP handles its own success callback
+					if ( !jsonp )
+						success();	
+				} else
+					jQuery.handleError(s, xml, status);
 
-				// Process result
-				if ( s.complete ) s.complete(xml, status);
+				// Fire the complete handlers
+				complete();
 
 				// Stop memory leaks
-				xml.onreadystatechange = function(){};
-				xml = null;
+				if ( s.async )
+					xml = null;
 			}
 		};
-		xml.onreadystatechange = onreadystatechange;
-
-		// 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);
+		}
 			
-		// save non-leaking reference 
-		var xml2 = xml;
-
 		// Send the data
 		try {
-			xml2.send(s.data);
+			xml.send(s.data);
 		} catch(e) {
 			jQuery.handleError(s, xml, null, e);
 		}
 		
 		// firefox 1.5 doesn't fire statechange for sync requests
-		if(!s.async)
+		if ( !s.async )
 			onreadystatechange();
 		
 		// return XMLHttpRequest to allow aborting the request etc.
-		return xml2;
+		return xml;
+
+		function success(){
+			// 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] );
+		}
+
+		function complete(){
+			// Process result
+			if ( s.complete )
+				s.complete(xml, status);
+
+			// The request was completed
+			if ( s.global )
+				jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active )
+				jQuery.event.trigger( "ajaxStop" );
+		}
 	},
 
-	handleError: function(s, xml, status, e) {
+	handleError: function( s, xml, status, e ) {
 		// If a local callback was specified, fire it
 		if ( s.error ) s.error( xml, status, e );
 
 		// Fire the global callback
-		if( s.global )
+		if ( s.global )
 			jQuery.event.trigger( "ajaxError", [xml, s, e] );
 	},
 
@@ -733,7 +841,7 @@ jQuery.extend({
 	active: 0,
 
 	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function(r) {
+	httpSuccess: function( r ) {
 		try {
 			return !r.status && location.protocol == "file:" ||
 				( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
@@ -743,7 +851,7 @@ jQuery.extend({
 	},
 
 	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function(xml, url) {
+	httpNotModified: function( xml, url ) {
 		try {
 			var xmlRes = xml.getResponseHeader("Last-Modified");
 
@@ -760,66 +868,52 @@ jQuery.extend({
 	 * (String) data - The type of data that you're expecting back,
 	 * (e.g. "xml", "html", "script")
 	 */
-	httpData: function(r,type) {
+	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;
+		var 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" ) {
+		if ( type == "script" )
 			jQuery.globalEval( data );
-		}
 
 		// Get the JavaScript object, if JSON is used.
-		if ( type == "json" ) eval( "data = " + data );
-
-		// evaluate scripts within html
-		if ( type == "html" ) jQuery("<div>").html(data).evalScripts();
+		if ( type == "json" )
+			data = eval("(" + data + ")");
 
 		return data;
 	},
 
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
-	param: function(a) {
+	param: function( a ) {
 		var s = [];
 
 		// If an array was passed in, assume that it is an array
 		// of form elements
-		if ( a.constructor == Array || a.jquery ) {
+		if ( a.constructor == Array || a.jquery )
 			// Serialize the form elements
-			for ( var i = 0; i < a.length; i++ )
-				s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) );
+			jQuery.each( a, function(){
+				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
+			});
 
 		// Otherwise, assume that it's an object of key/value pairs
-		} else {
+		else
 			// Serialize the key/values
-			for ( var j in a ) {
+			for ( var j in a )
 				// If the value is an array then the key names need to be repeated
-				if( a[j].constructor == Array ) {
-					for (var k = 0; k < a[j].length; k++) {
-						s.push( j + "=" + encodeURIComponent( a[j][k] ) );
-					}
-				} else {
-					s.push( j + "=" + encodeURIComponent( a[j] ) );
-				}
-			}
-		}
+				if ( a[j] && a[j].constructor == Array )
+					jQuery.each( a[j], function(){
+						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
+					});
+				else
+					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
 
 		// Return the resulting serialization
 		return s.join("&");
-	},
-	
-	// evalulates a script in global context
-	// not reliable for safari
-	globalEval: function(data) {
-		if (window.execScript)
-			window.execScript( data );
-		else if(jQuery.browser.safari)
-			// safari doesn't provide a synchronous global eval
-			window.setTimeout( data, 0 );
-		else
-			eval.call( window, data );
 	}
 
 });