X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=ajax%2Fajax.js;h=5d6126af293db7f03d85e578be64d6bc9ed7cc1f;hb=2d9979c73fad6f9aa6e78054dedb0e4aa78ec551;hp=bd08f83e0a005f3ff67ea616bba363e9c3b24af0;hpb=b9e0b6ff37ab837ef2e031bac23c36ee3007cc46;p=jquery.git

diff --git a/ajax/ajax.js b/ajax/ajax.js
index bd08f83..5d6126a 100644
--- a/ajax/ajax.js
+++ b/ajax/ajax.js
@@ -2,121 +2,203 @@
 // Docs Here:
 // http://jquery.com/docs/ajax/
 
-if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'function') {
-	var XMLHttpRequest = function() {
-		return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ? 
-			"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP");
-	};
-}
-
-$.xml = function( type, url, data, ret ) {
-	var xml = new XMLHttpRequest();
-
-	if ( xml ) {
-		xml.open(type || "GET", url, true);
-
-		if ( data )
-			xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-
-		xml.onreadystatechange = function() {
-			if ( xml.readyState == 4 ) {
-				if ( ret ) ret(xml);
-				$.triggerAJAX( $.httpData(xml) );
-			}
-		};
-
-		xml.send(data)
+/**
+ * Load HTML from a remote file and inject it into the DOM
+ */
+jQuery.prototype.load = function( url, params, callback ) {
+	// I overwrote the event plugin's .load
+	// this won't happen again, I hope -John
+	if ( url && url.constructor == Function )
+		return this.bind("load", url);
+
+	// Default to a GET request
+	var type = "GET";
+
+	// If the second parameter was provided
+	if ( params ) {
+		// If it's a function
+		if ( params.constructor == Function ) {
+			// We assume that it's the callback
+			callback = params;
+			params = null;
+			
+		// Otherwise, build a param string
+		} else {
+			params = jQuery.param( params );
+			type = "POST";
+		}
 	}
-};
-
-$.httpData = function(r,type) {
-	return r.getResponseHeader("content-type").indexOf("xml") > 0 || type == "xml" ?
-		r.responseXML : r.responseText;
-};
+	
+	var self = this;
+	
+	// Request the remote document
+	jQuery.ajax( type, url, params,function(res){
+			
+		// Inject the HTML into all the matched elements
+		self.html(res.responseText).each(function(){
+			// If a callback function was provided
+			if ( callback && callback.constructor == Function )
+				// Execute it within the context of the element
+				callback.apply( self, [res.responseText] );
+		});
+		
+		// Execute all the scripts inside of the newly-injected HTML
+		$("script", self).each(function(){
+			eval( this.text || this.textContent || this.innerHTML || "");
+		});
 
-$.get = function( url, ret, type ) {
-	$.xml( "GET", url, null, function(r) {
-		if ( ret ) ret( $.httpData(r,type) );
 	});
+	
+	return this;
 };
 
-$.getXML = function( url, ret ) {
-	$.get( url, ret, "xml" );
+/**
+ * Load a remote page using a GET request
+ */
+jQuery.get = function( url, callback, type ) {
+	// Build and start the HTTP Request
+	jQuery.ajax( "GET", url, null, function(r) {
+		if ( callback ) callback( jQuery.httpData(r,type) );
+	});
 };
 
-$.post = function( url, data, ret, type ) {
-	$.xml( "POST", url, $.param(data), function(r) {
-		if ( ret ) ret( $.httpData(r,type) );
+/**
+ * Load a remote page using a POST request.
+ */
+jQuery.post = function( url, data, callback, type ) {
+	// Build and start the HTTP Request
+	jQuery.ajax( "POST", url, jQuery.param(data), function(r) {
+		if ( callback ) callback( jQuery.httpData(r,type) );
 	});
 };
 
-$.postXML = function( url, data, ret ) {
-	$.post( url, data, ret, "xml" );
-};
+// If IE is used, create a wrapper for the XMLHttpRequest object
+if ( jQuery.browser == "msie" )
+	XMLHttpRequest = function(){
+		return new ActiveXObject(
+			(navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ?
+			"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
+		);
+	};
 
-// Global AJAX Event Binding
-// Requested here:
-// http://jquery.com/discuss/2006-March/000415/
+// Attach a bunch of functions for handling common AJAX events
+(function(){
+	var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(',');
+	
+	for ( var i = 0; i < e.length; i++ ){ (function(){
+		var o = e[i];
+		jQuery.fn[o] = function(f){return this.bind(o, f);};
+	})();}
+})();
+
+/**
+ * A common wrapper for making XMLHttpRequests
+ */
+jQuery.ajax = function( type, url, data, ret ) {
+	// If only a single argument was passed in,
+	// assume that it is a object of key/value pairs
+	if ( !url ) {
+		ret = type.complete;
+		var success = type.success;
+		var error = type.error;
+		data = type.data;
+		url = type.url;
+		type = type.type;
+	}
+	
+	// Watch for a new set of requests
+	if ( ! jQuery.ajax.active++ )
+		jQuery.event.trigger( "ajaxStart" );
+
+	// Create the request object
+	var xml = new XMLHttpRequest();
+
+	// Open the socket
+	xml.open(type || "GET", url, true);
+	
+	// Set the correct header, if data is being sent
+	if ( data )
+		xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+
+	// Set header so calling 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");
+
+	// Wait for a response to come back
+	xml.onreadystatechange = function(){
+		// The transfer is complete and the data is available
+		if ( xml.readyState == 4 ) {
+			// Make sure that the request was successful
+			if ( jQuery.httpSuccess( xml ) ) {
+			
+				// If a local callback was specified, fire it
+				if ( success ) success( xml );
+				
+				// Fire the global callback
+				jQuery.event.trigger( "ajaxSuccess" );
+			
+			// Otherwise, the request was not successful
+			} else {
+				// If a local callback was specified, fire it
+				if ( error ) error( xml );
+				
+				// Fire the global callback
+				jQuery.event.trigger( "ajaxError" );
+			}
+			
+			// The request was completed
+			jQuery.event.trigger( "ajaxComplete" );
+			
+			// Handle the global AJAX counter
+			if ( ! --jQuery.ajax.active )
+				jQuery.event.trigger( "ajaxStop" );
+
+			// Process result
+			if ( ret ) ret(xml);
+		}
+	};
 
-$.fn.handleAJAX = function( callback ) {
-	$.ajaxHandles = $.merge( $.ajaxHandles, this.cur );
-	return this.bind( 'ajax', callback );
+	// Send the data
+	xml.send(data);
 };
 
-$.ajaxHandles = [];
-$.triggerAJAX = function(data){
-	for ( var i = 0; i < $.ajaxHandles.length; i++ )
-		triggerEvent( $.ajaxHandles[i], 'ajax', [data] );
+// Counter for holding the number of active queries
+jQuery.ajax.active = 0;
+
+// Determines if an XMLHttpRequest was successful or not
+jQuery.httpSuccess = function(r) {
+	return ( r.status && ( r.status >= 200 && r.status < 300 ) || 
+		r.status == 304 ) || !r.status && location.protocol == "file:";
 };
 
-// Dynamic Form Submission
-// Based upon the mailing list post at:
-// http://jquery.com/discuss/2006-March/000424/
-
-$.fn.serialize = function(callback) {
-	return this.each(function(){
-		var a = {};
-		$(this)
-			.find("input:checked,hidden,text,option[@selected],textarea")
-			.filter(":enabled").each(function() {
-				a[ this.name || this.id || this.parentNode.name || this.parentNode.id ] = this.value;
-			});
-		$.xml( this.method || "GET", this.action || "", $.param(a), callback );
-	});
+// Get the data out of an XMLHttpRequest
+jQuery.httpData = function(r,type) {
+	// Check the headers, or watch for a force override
+	return r.getResponseHeader("content-type").indexOf("xml") > 0 || 
+		type == "xml" ? r.responseXML : r.responseText;
 };
 
-$.param = function(a) {
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function(a) {
 	var s = [];
-	for ( var i in a )
-	s[s.length] = i + "=" + encodeURIComponent( a[i] );
+	
+	// If an array was passed in, assume that it is an array
+	// of form elements
+	if ( a.constructor == Array )
+		// Serialize the form elements
+		for ( var i = 0; i < a.length; i++ )
+			s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) );
+		
+	// Otherwise, assume that it's an object of key/value pairs
+	else
+		// Serialize the key/values
+		for ( var j in a )
+			s.push( j + "=" + encodeURIComponent( a[j] ) );
+	
+	// Return the resulting serialization
 	return s.join("&");
 };
-
-$.fn.load = function(a,o,f) {
-	// Arrrrghhhhhhhh!!
-	// I overwrote the event plugin's .load
-	// this won't happen again, I hope -John
-	if ( a && a.constructor == Function )
-		return this.bind("load", a);
-
-	var t = "GET";
-	if ( o && o.constructor == Function ) {
-		f = o;
-		o = null;
-	}
-	if (o != null) {
-		o = $.param(o);
-		t = "POST";
-	}
-	var self = this;
-	$.xml(t,a,o,function(h){
-		var h = h.responseText;
-		self.html(h).find("script").each(function(){
-			try {
-				eval( this.text || this.textContent || this.innerHTML );
-			} catch(e){}
-		});
-		if(f)f(h);
-	});
-	return this;
-};