X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=ajax%2Fajax.js;h=f6a1d9e20ff6fbb117616d57414a98bdcf710c45;hb=0a9c5698398f7a8347d2d5956c9d11a3eb2933d6;hp=db347432e02a58ebf0a6844ffc7b8e46cc3069be;hpb=70cab836b0d87ec1a94658411c398658780f5810;p=jquery.git

diff --git a/ajax/ajax.js b/ajax/ajax.js
index db34743..f6a1d9e 100644
--- a/ajax/ajax.js
+++ b/ajax/ajax.js
@@ -5,7 +5,7 @@
 /**
  * Load HTML from a remote file and inject it into the DOM
  */
-$.fn.load = function( url, params, callback ) {
+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 )
@@ -24,7 +24,7 @@ $.fn.load = function( url, params, callback ) {
 			
 		// Otherwise, build a param string
 		} else {
-			params = $.param( params );
+			params = jQuery.param( params );
 			type = "POST";
 		}
 	}
@@ -32,14 +32,14 @@ $.fn.load = function( url, params, callback ) {
 	var self = this;
 	
 	// Request the remote document
-	$.ajax( type, url, params,function(res){
+	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
-				$.apply( self, callback, [res.responseText] );
+				callback.apply( self, [res.responseText] );
 		});
 		
 		// Execute all the scripts inside of the newly-injected HTML
@@ -55,49 +55,46 @@ $.fn.load = function( url, params, callback ) {
 /**
  * Load a remote page using a GET request
  */
-$.get = function( url, callback, type ) {
+jQuery.get = function( url, callback, type ) {
 	// Build and start the HTTP Request
-	$.ajax( "GET", url, null, function(r) {
-		if ( callback ) callback( $.httpData(r,type) );
+	jQuery.ajax( "GET", url, null, function(r) {
+		if ( callback ) callback( jQuery.httpData(r,type) );
 	});
 };
 
 /**
  * Load a remote page using a POST request.
  */
-$.post = function( url, data, callback, type ) {
+jQuery.post = function( url, data, callback, type ) {
 	// Build and start the HTTP Request
-	$.ajax( "POST", url, $.param(data), function(r) {
-		if ( callback ) callback( $.httpData(r,type) );
+	jQuery.ajax( "POST", url, jQuery.param(data), function(r) {
+		if ( callback ) callback( jQuery.httpData(r,type) );
 	});
 };
 
 // If IE is used, create a wrapper for the XMLHttpRequest object
-if ( $.browser == "msie" )
+if ( jQuery.browser == "msie" )
 	XMLHttpRequest = function(){
 		return new ActiveXObject(
-			(navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ?
+			(navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ?
 			"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
 		);
 	};
 
-// Counter for holding the number of active queries
-$.xmlActive = 0;
-
 // Attach a bunch of functions for handling common AJAX events
 (function(){
-	var e = ['ajaxStart','ajaxComplete','ajaxError','ajaxSuccess'];
+	var e = "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess".split(',');
 	
 	for ( var i = 0; i < e.length; i++ ){ (function(){
 		var o = e[i];
-		$.fn[o] = function(f){return this.bind(o, f);};
+		jQuery.fn[o] = function(f){return this.bind(o, f);};
 	})();}
 })();
 
 /**
  * A common wrapper for making XMLHttpRequests
  */
-$.ajax = function( type, url, data, ret ) {
+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 ) {
@@ -108,6 +105,10 @@ $.ajax = function( type, url, data, ret ) {
 		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();
@@ -117,46 +118,27 @@ $.ajax = function( type, url, data, ret ) {
 	
 	// Set the correct header, if data is being sent
 	if ( data )
-		xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		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');
+	xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 
 	// Make sure the browser sends the right content length
 	if ( xml.overrideMimeType )
-		xml.setRequestHeader('Connection', 'close');
+		xml.setRequestHeader("Connection", "close");
 
 	// Wait for a response to come back
 	xml.onreadystatechange = function(){
-		// Socket is openend
-		if ( xml.readyState == 1 ) {
-			// Increase counter
-			$.xmlActive++;
-
-			// Show loader if needed
-			if ( $.xmlActive >= 1 && $.xmlCreate )
-				$.event.trigger( 'ajaxStart' );
-		}
-
-		// Socket is closed and data is available
+		// The transfer is complete and the data is available
 		if ( xml.readyState == 4 ) {
-			// Decrease counter
-			$.xmlActive--;
-
-			// Hide loader if needed
-			if ( $.xmlActive <= 0 && $.xmlDestroy ) {
-				$.event.trigger( 'ajaxComplete' );
-				$.xmlActive = 0
-			}
-
 			// Make sure that the request was successful
-			if ( $.httpSuccess( xml ) ) {
+			if ( jQuery.httpSuccess( xml ) ) {
 			
 				// If a local callback was specified, fire it
 				if ( success ) success( xml );
 				
 				// Fire the global callback
-				$.event.trigger( 'ajaxSuccess' );
+				jQuery.event.trigger( "ajaxSuccess" );
 			
 			// Otherwise, the request was not successful
 			} else {
@@ -164,8 +146,15 @@ $.ajax = function( type, url, data, ret ) {
 				if ( error ) error( xml );
 				
 				// Fire the global callback
-				$.event.trigger( 'ajaxError' );
+				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);
@@ -176,22 +165,31 @@ $.ajax = function( type, url, data, ret ) {
 	xml.send(data);
 };
 
+// Counter for holding the number of active queries
+jQuery.ajax.active = 0;
+
 // Determines if an XMLHttpRequest was successful or not
-$.httpSuccess = function(r) {
-	return ( r.status && ( r.status >= 200 && r.status < 300 ) || 
-		r.status == 304 ) || !r.status && location.protocol == 'file:';
+jQuery.httpSuccess = function(r) {
+  try {
+    return r.status ?
+      ( r.status >= 200 && r.status < 300 ) || r.status == 304 :
+      location.protocol == "file:";
+  } catch(e){}
+  return false;
 };
 
-// Get the data out of an XMLHttpRequest
-$.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;
+// Get the data out of an XMLHttpRequest.
+// Return parsed XML if content-type header is "xml" and type is "xml" or omitted,
+// otherwise return plain text.
+jQuery.httpData = function(r,type) {
+  var ct = r.getResponseHeader("content-type");
+	var xml = ( !type || type == "xml" ) && ct && ct.indexOf("xml") >= 0;
+	return xml ? r.responseXML : r.responseText;
 };
 
 // Serialize an array of form elements or a set of
 // key/values into a query string
-$.param = function(a) {
+jQuery.param = function(a) {
 	var s = [];
 	
 	// If an array was passed in, assume that it is an array