From faefbb1ad0b81e8001b582d06d5bd9c9236e62ce Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 19 Dec 2010 15:33:53 -0600
Subject: [PATCH 001/110] Fix #7717 and #7165. Thanks to dmethvin and iliakan
 for their help fixing these issues.

---
 src/data.js               |  8 ++++++--
 src/manipulation.js       |  4 ++--
 test/unit/manipulation.js | 28 ++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/data.js b/src/data.js
index f1e031fff..120fe718d 100644
--- a/src/data.js
+++ b/src/data.js
@@ -9,7 +9,7 @@ jQuery.extend({
 	// Please use with caution
 	uuid: 0,
 
-	// Unique for each copy of jQuery on the page	
+	// Unique for each copy of jQuery on the page
 	expando: "jQuery" + jQuery.now(),
 
 	// The following elements throw uncatchable exceptions if you
@@ -21,6 +21,10 @@ jQuery.extend({
 		"applet": true
 	},
 
+	hasData: function( elem ) {
+		return !elem.nodeType || (elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
+	},
+
 	data: function( elem, name, data ) {
 		if ( !jQuery.acceptData( elem ) ) {
 			return;
@@ -144,7 +148,7 @@ jQuery.fn.extend({
 					var attr = this[0].attributes, name;
 					for ( var i = 0, l = attr.length; i < l; i++ ) {
 						name = attr[i].name;
-	
+
 						if ( name.indexOf( "data-" ) === 0 ) {
 							name = name.substr( 5 );
 							dataAttr( this[0], name, data[ name ] );
diff --git a/src/manipulation.js b/src/manipulation.js
index 7dea3493c..c23f62ed1 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -373,12 +373,12 @@ function cloneCopyEvent(orig, ret) {
 	var i = 0;
 
 	ret.each(function() {
-		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) || !jQuery.hasData(orig[i]) ) {
 			return;
 		}
 
 		var oldData = jQuery.data( orig[i++] ),
-			curData = jQuery.data( this, oldData ),
+			curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
 			events = oldData && oldData.events;
 
 		if ( events ) {
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index d49029eb8..52f76ed69 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -51,7 +51,7 @@ test("text(Function) with incoming value", function() {
 });
 
 var testWrap = function(val) {
-	expect(18);
+	expect(19);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').wrap(val( '<div class="red"><span></span></div>' )).text();
 	equals( defaultText, result, 'Check for wrapping of on-the-fly html' );
@@ -80,10 +80,20 @@ var testWrap = function(val) {
 	equals( jQuery("#nonnodes > i").text(), j.text(), "Check node,textnode,comment wraps doesn't hurt text" );
 
 	// Try wrapping a disconnected node
+	var cacheLength = 0;
+	for (var i in jQuery.cache) {
+		cacheLength++;
+	}
+
 	j = jQuery("<label/>").wrap(val( "<li/>" ));
 	equals( j[0].nodeName.toUpperCase(), "LABEL", "Element is a label" );
 	equals( j[0].parentNode.nodeName.toUpperCase(), "LI", "Element has been wrapped" );
 
+	for (i in jQuery.cache) {
+		cacheLength--;
+	}
+	equals(cacheLength, 0, "No memory leak in jQuery.cache (bug #7165)");
+
 	// Wrap an element containing a text node
 	j = jQuery("<span/>").wrap("<div>test</div>");
 	equals( j[0].previousSibling.nodeType, 3, "Make sure the previous node is a text element" );
@@ -856,7 +866,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(36);
+	expect(37);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -914,10 +924,16 @@ test("clone()", function() {
 	equals( clone.html(), div.html(), "Element contents cloned" );
 	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 
-	div = jQuery("<div/>").data({ a: true, b: true });
-	div = div.clone(true);
-	equals( div.data("a"), true, "Data cloned." );
-	equals( div.data("b"), true, "Data cloned." );
+	div = jQuery("<div/>").data({
+		a: true, b: true,
+		c: { nesty: ["Block", "Head"] }
+	});
+	var div2 = div.clone(true);
+	equals( div2.data("a"), true, "Data cloned." );
+	equals( div2.data("b"), true, "Data cloned." );
+	var c = div2.data("c");
+	c.nesty[0] = "Fish";
+	equals( div.data("c").nesty[0], "Block", "Ensure cloned element data is deep copied (Bug #7717)" );
 
 	var form = document.createElement("form");
 	form.action = "/test/";

From 88d97deb773e6142b7656a4bc4ee973957b6ba49 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Mon, 20 Dec 2010 19:09:15 +0100
Subject: [PATCH 002/110] Added deferred to core. Used internally for DOM
 readyness and ajax callbacks.

---
 src/core.js       | 208 +++++++++++++++++++++++++++++++-------
 src/xhr.js        | 171 +++++--------------------------
 test/unit/core.js | 250 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 450 insertions(+), 179 deletions(-)

diff --git a/src/core.js b/src/core.js
index 346e52d70..f7713ca82 100644
--- a/src/core.js
+++ b/src/core.js
@@ -60,8 +60,8 @@ var jQuery = function( selector, context ) {
 	// Has the ready events already been bound?
 	readyBound = false,
 	
-	// The functions to execute on DOM ready
-	readyList = [],
+	// The deferred used on DOM ready
+	readyList,
 
 	// The ready event handler
 	DOMContentLoaded,
@@ -75,7 +75,10 @@ var jQuery = function( selector, context ) {
 	indexOf = Array.prototype.indexOf,
 	
 	// [[Class]] -> type pairs
-	class2type = {};
+	class2type = {},
+	
+	// Marker for deferred
+	deferredMarker = [];
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -253,22 +256,12 @@ jQuery.fn = jQuery.prototype = {
 		return jQuery.each( this, callback, args );
 	},
 	
-	ready: function( fn ) {
+	ready: function() {
 		// Attach the listeners
 		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
+		
+		// Change ready & apply
+		return ( jQuery.fn.ready = readyList.then ).apply( this , arguments );
 	},
 	
 	eq: function( i ) {
@@ -415,23 +408,11 @@ jQuery.extend({
 			}
 
 			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn,
-					i = 0,
-					ready = readyList;
-
-				// Reset the list of functions
-				readyList = null;
-
-				while ( (fn = ready[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Trigger any bound ready events
-				if ( jQuery.fn.trigger ) {
-					jQuery( document ).trigger( "ready" ).unbind( "ready" );
-				}
+			readyList.fire( document , [ jQuery ] );
+			
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
 			}
 		}
 	},
@@ -800,6 +781,160 @@ jQuery.extend({
 	now: function() {
 		return (new Date()).getTime();
 	},
+	
+	// Create a simple deferred (one callbacks list)
+	_deferred: function( cancellable ) {
+		
+		// cancellable by default
+		cancellable = cancellable !== false;
+		
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+				
+				// then( f1, f2, ...)
+				then: function() {
+					
+					if ( ! cancelled ) {
+					
+						var args = arguments,
+							i,
+							type,
+							_fired;
+							
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						
+						for ( i in args ) {
+							i = args[ i ];
+							type = jQuery.type( i );
+							if ( type === "array" ) {
+								this.then.apply( this , i );
+							} else if ( type === "function" ) {
+								callbacks.push( i );
+							}
+						}
+						
+						if ( _fired ) {
+							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+				
+				// resolve with given context and args
+				// (i is used internally)
+				fire: function( context , args , i ) {
+					if ( ! cancelled && ! fired && ! firing ) {
+						firing = 1;
+						try {
+							for( i = 0 ; ! cancelled && callbacks[ i ] ; i++ ) {
+								cancelled = ( callbacks[ i ].apply( context , args ) === false ) && cancellable;
+							}
+						} catch( e ) {
+							cancelled = cancellable;
+							jQuery.error( e );
+						} finally {
+							fired = [ context , args ];
+							callbacks = cancelled ? [] : callbacks.slice( i + 1 );
+							firing = 0;
+						}
+					}
+					return this;
+				},
+				
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.fire( this , arguments );
+					return this;
+				},
+				
+				// cancelling further callbacks
+				cancel: function() {
+					if ( cancellable ) {
+						callbacks = [];
+						cancelled = 1;
+					}
+					return this;
+				}
+				
+			};
+		
+		// Add the deferred marker
+		deferred.then._ = deferredMarker;
+		
+		return deferred;
+	},
+	
+	// Full fledged deferred (two callbacks list)
+	// Typical success/error system
+	deferred: function( func , cancellable ) {
+		
+		// Handle varargs
+		if ( arguments.length === 1 ) {
+			
+			if ( typeof func === "boolean" ) {
+				cancellable = func;
+				func = 0;
+			}
+		}
+		
+		var errorDeferred = jQuery._deferred( cancellable ),
+			deferred = jQuery._deferred( cancellable ),
+			// Keep reference of the cancel method since we'll redefine it
+			cancelThen = deferred.cancel;
+			
+		// Add errorDeferred methods and redefine cancel			
+		jQuery.extend( deferred , {
+
+				fail: errorDeferred.then,
+				fireReject: errorDeferred.fire,
+				reject: errorDeferred.resolve,
+				cancel: function() {
+					cancelThen();
+					errorDeferred.cancel();
+					return this;
+				}
+
+		} );
+		
+		// Make sure only one callback list will be used
+		deferred.then( errorDeferred.cancel ).fail( cancelThen );
+		
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred , deferred );
+		}
+		
+		return deferred;
+	},
+
+	// Check if an object is a deferred
+	isDeferred: function( object , method ) {
+		method = method || "then";
+		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	},
+	
+	// Deferred helper
+	when: function( object , method ) {
+		method = method || "then";
+		object = jQuery.isDeferred( object , method ) ?
+			object :
+			jQuery.deferred().resolve( object );
+		object.fail = object.fail || function() { return this; };
+		object[ method ] = object[ method ] || object.then;
+		object.then = object.then || object[ method ];
+		return object;
+	},
 
 	// Use of jQuery.browser is frowned upon.
 	// More details: http://docs.jquery.com/Utilities/jQuery.browser
@@ -818,6 +953,11 @@ jQuery.extend({
 	browser: {}
 });
 
+// Create readyList deferred
+// also force $.fn.ready to be recognized as a defer
+readyList = jQuery._deferred( false );
+jQuery.fn.ready._ = deferredMarker;
+
 // Populate the class2type map
 jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
diff --git a/src/xhr.js b/src/xhr.js
index 57903e046..5dd25b9a4 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -18,18 +18,19 @@ jQuery.xhr = function( _native ) {
 		return jQuery.ajaxSettings.xhr();
 	}
 	
-	function reset(force) {
+	function reset( force ) {
 		
 		// We only need to reset if we went through the init phase
 		// (with the exception of object creation)
 		if ( force || internal ) {
-		
+			
 			// Reset callbacks lists
-			callbacksLists = {
-				success: createCBList(),
-				error: createCBList(),
-				complete: createCBList()
-			};
+			deferred = jQuery.deferred();
+			completeDeferred = jQuery._deferred();
+			
+			xhr.success = xhr.then = deferred.then;
+			xhr.error = xhr.fail = deferred.fail;
+			xhr.complete = completeDeferred.then;
 			
 			// Reset private variables
 			requestHeaders = {};
@@ -155,8 +156,8 @@ jQuery.xhr = function( _native ) {
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
 		
-		for ( i in callbacksLists ) {
-			callbacksLists[i].bind(s[i]);
+		for ( i in { success:1, error:1, complete:1 } ) {
+			xhr[ i ]( s[ i ] );
 		}
 		
 		// Watch for a new set of requests
@@ -355,10 +356,12 @@ jQuery.xhr = function( _native ) {
 		
 		// Keep local copies of vars in case callbacks re-use the xhr
 		var _s = s,
-			_callbacksLists = callbacksLists,
+			_deferred = deferred,
+			_completeDeferred = completeDeferred,
 			_callbackContext = callbackContext,
 			_globalEventContext = globalEventContext;
 			
+			
 		// Set state if the xhr hasn't been re-used
 		function _setState( value ) {
 			if ( xhr.readyState && s === _s ) {
@@ -375,18 +378,20 @@ jQuery.xhr = function( _native ) {
 		// We're done
 		_setState( 4 );
 		
-		// Success
-		_callbacksLists.success.fire( isSuccess , _callbackContext , success, statusText, xhr);
-		if ( isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxSuccess", [xhr, _s, success] );
+		// Success/Error
+		if ( isSuccess ) {
+			_deferred.fire( _callbackContext , [ success , statusText , xhr ] );
+		} else {
+			_deferred.fireReject( _callbackContext , [ xhr , statusText , error ] );
 		}
-		// Error
-		_callbacksLists.error.fire( ! isSuccess , _callbackContext , xhr, statusText, error);
-		if ( !isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxError", [xhr, _s, error] );	
+		
+		if ( _s.global ) {
+			_globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , [ xhr , _s , isSuccess ? success : error ] );
 		}
+		
 		// Complete
-		_callbacksLists.complete.fire( 1 , _callbackContext, xhr, statusText);
+		_completeDeferred.fire( _callbackContext, [ xhr , statusText ] );
+		
 		if ( _s.global ) {
 			_globalEventContext.trigger( "ajaxComplete", [xhr, _s] );
 			// Handle the global AJAX counter
@@ -419,7 +424,8 @@ jQuery.xhr = function( _native ) {
 		// Callback stuff
 		callbackContext,
 		globalEventContext,
-		callbacksLists,
+		deferred,
+		completeDeferred,
 		// Headers (they are sent all at once)
 		requestHeaders,
 		// Response headers
@@ -596,135 +602,10 @@ jQuery.xhr = function( _native ) {
 	// Init data (so that we can bind callbacks early
 	reset(1);
 
-	// Install callbacks related methods
-	jQuery.each(callbacksLists, function(name) {
-		var list;
-		xhr[name] = function() {
-			list = callbacksLists[name];
-			if ( list ) {
-				list.bind.apply(list, arguments );
-			}
-			return this;
-		};
-	});
-	
 	// Return the xhr emulation
 	return xhr;
 };
 
-// Create a callback list
-function createCBList() {
-	
-	var functors = [],
-		autoFire = 0,
-		fireArgs,
-		list = {
-		
-			fire: function( flag , context ) {
-				
-				// Save info for later bindings
-				fireArgs = arguments;
-				
-				// Remove autoFire to keep bindings in order
-				autoFire = 0;
-					
-				var args = sliceFunc.call( fireArgs , 2 );
-					
-				// Execute callbacks
-				while ( flag && functors.length ) {
-					flag = functors.shift().apply( context , args ) !== false;
-				}
-					
-				// Clean if asked to stop
-				if ( ! flag ) {
-					clean();
-				}
-						
-				// Set autoFire
-				autoFire = 1;					
-			},
-			
-			bind: function() {
-				
-				var args = arguments,
-					i = 0,
-					length = args.length,
-					func;
-				
-				for ( ; i < length ; i++ ) {
-					
-					func = args[ i ];
-					
-					if ( jQuery.isArray(func) ) {
-						
-						list.bind.apply( list , func );
-						
-					} else if ( isFunction(func) ) {
-						
-						// Add if not already in
-						if ( ! pos( func ) ) {
-							functors.push( func );
-						}
-					}
-				}
-				
-				if ( autoFire ) {
-					list.fire.apply( list , fireArgs );
-				}
-			},
-			
-			unbind: function() {
-				
-				var i = 0,
-					args = arguments,
-					length = args.length,
-					func,					
-					position;
-					
-				if ( length ) {
-						
-					for( ; i < length ; i++ ) {
-						func = args[i];
-						if ( jQuery.isArray(func) ) {
-							list.unbind.apply(list,func);
-						} else if ( isFunction(func) ) {
-							position = pos(func);
-							if ( position ) {
-								functors.splice(position-1,1);
-							}
-						}
-					}
-				
-				} else {
-					
-					functors = [];
-				
-				}
-
-			}
-			
-		};
-
-	// Get the index of the functor in the list (1-based)
-	function pos( func ) {
-		for (var i = 0, length = functors.length; i < length && functors[i] !== func; i++) {
-		}
-		return i < length ? ( i + 1 ) : 0;
-	}
-		
-	// Clean the object
-	function clean() {
-		// Empty callbacks list
-		functors = [];
-		// Inhibit methods
-		for (var i in list) {
-			list[i] = jQuery.noop;
-		}
-	}
-				
-	return list;
-}
-
 jQuery.extend(jQuery.xhr, {
 	
 	// Add new prefilter
diff --git a/test/unit/core.js b/test/unit/core.js
index 705778370..f4117247a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -902,3 +902,253 @@ test("jQuery.parseJSON", function(){
 		ok( true, "Test malformed JSON string." );
 	}
 });
+
+test("jQuery._deferred()", function() {
+	
+	expect( 14 );
+	
+	var deferred,
+		object,
+		test;
+	
+	deferred = jQuery._deferred();
+		
+	test = false;
+		
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test pre-resolve callback" );
+		test = true;
+	} );
+	
+	deferred.resolve( "value" );
+	
+	ok( test , "Test pre-resolve callbacks called right away" );
+
+	test = false;
+	
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test post-resolve callback" );
+		test = true;
+	} );
+	
+	ok( test , "Test post-resolve callbacks called right away" );
+	
+	deferred.cancel();
+	
+	test = true;
+	
+	deferred.then( function() {
+		ok( false , "Manual cancel was ignored" );
+		test = false;
+	} );
+	
+	ok( test , "Test manual cancel" );
+	
+	deferred = jQuery._deferred().then( function() {
+		return false;
+	} );
+	
+	deferred.resolve();
+	
+	test = true;
+	
+	deferred.then( function() {
+		test = false;
+	} );
+	
+	ok( test , "Test cancel by returning false" );
+
+	try {
+		deferred = jQuery._deferred().resolve().then( function() {
+			throw "Error";
+		} , function() {
+			ok( false , "Test deferred cancel on exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	test = "";
+	deferred = jQuery._deferred().then( function() {
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+		
+	} ).resolve();
+	
+	strictEqual( test , "AB" , "Test multiple then parameters" );
+	
+	test = "";
+	
+	deferred.then( function() {
+		
+		deferred.then( function() {
+			
+			test += "C";
+			
+		} );
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+	} );
+	
+	strictEqual( test , "ABC" , "Test then callbacks order" );
+	
+	deferred = jQuery._deferred( false ).resolve().cancel();
+	
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled manually");
+		return false;
+	} );
+
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled by returning false");
+	} );
+	
+	try {
+		deferred.then( function() {
+			throw "Error";
+		} , function() {
+			ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	deferred = jQuery._deferred();
+	
+	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
+		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
+	});
+});
+
+test("jQuery.deferred()", function() {
+	
+	expect( 8 );
+	
+	jQuery.deferred( function( defer ) {
+		strictEqual( this , defer , "Defer passed as this & first argument" );
+		this.resolve( "done" );
+	}).then( function( value ) {
+		strictEqual( value , "done" , "Passed function executed" );
+	});
+	
+	jQuery.deferred().resolve().then( function() {
+		ok( true , "Success on resolve" );
+	}).fail( function() {
+		ok( false , "Error on resolve" );
+	});
+	
+	jQuery.deferred().reject().then( function() {
+		ok( false , "Success on reject" );
+	}).fail( function() {
+		ok( true , "Error on reject" );
+	});
+	
+	var flag = true;
+	
+	jQuery.deferred().resolve().cancel().then( function() {
+		ok( flag = false , "Success on resolve/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on resolve/cancel" );
+	});
+	
+	ok( flag , "Cancel on resolve" );
+	
+	flag = true;
+	
+	jQuery.deferred().reject().cancel().then( function() {
+		ok( flag = false , "Success on reject/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on reject/cancel" );
+	});
+	
+	ok( flag , "Cancel on reject" );
+	
+	jQuery.deferred( false ).resolve().then( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on resolve" );
+	});
+	
+	jQuery.deferred( false ).reject().fail( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on reject" );
+	});
+	
+});
+	
+test("jQuery.isDeferred()", function() {
+	
+	expect( 11 );
+	
+	var object1 = { then: function() { return this; } },
+		object2 = { then: function() { return this; } };
+		
+	object2.then._ = [];
+	
+	// The use case that we want to match
+	ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
+	ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
+	
+	// Some other objects
+	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
+	ok(!jQuery.isDeferred(object2), "Object with then & marker");
+	
+	// Not objects shouldn't be matched
+	ok(!jQuery.isDeferred(""), "string");
+	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
+	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
+	ok(!jQuery.isDeferred(null), "null");
+	ok(!jQuery.isDeferred(undefined), "undefined");
+	
+	object1 = {custom: jQuery._deferred().then};
+	
+	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
+	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
+});
+
+test("jQuery.when()", function() {
+	
+	expect( 5 );
+	
+	var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
+	
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || jQuery.deferred( function() {
+			this.resolve( i );
+		}) ).then( function( value ) {
+			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Fail called" );
+		});
+	}
+	
+	cache = 0;
+
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || deferred , "done" ).done( function( value ) {
+			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Custom method: fail called" );
+		});
+	}
+	
+	stop();
+	
+	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
+		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
+		start();
+	});
+});

From 9e3f053c6568863251da20eba713d05f2bbdf9f0 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 00:56:00 +0100
Subject: [PATCH 003/110] Fixed a loop that only worked in webkit.

---
 src/core.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/core.js b/src/core.js
index f7713ca82..39d49743c 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,12 +800,14 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function() {
+				then: function then() {
 					
 					if ( ! cancelled ) {
 					
 						var args = arguments,
 							i,
+							length,
+							elem,
 							type,
 							_fired;
 							
@@ -814,13 +816,13 @@ jQuery.extend({
 							fired = 0;
 						}
 						
-						for ( i in args ) {
-							i = args[ i ];
-							type = jQuery.type( i );
+						for ( i = 0, length = args.length ; i < length ; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								this.then.apply( this , i );
+								then.apply( this , elem );
 							} else if ( type === "function" ) {
-								callbacks.push( i );
+								callbacks.push( elem );
 							}
 						}
 						

From 4424bda377336342ce04ab5299bf1ce624cdb7b1 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Mon, 20 Dec 2010 22:23:59 -0500
Subject: [PATCH 004/110] Use a for loop rather than for/in loop when copying
 events, so that code will work with an augmented Array.prototype. Fixes 7809.

---
 src/manipulation.js       | 10 +++++-----
 test/unit/manipulation.js |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/manipulation.js b/src/manipulation.js
index 7dea3493c..9d70a7b03 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -370,14 +370,14 @@ function root( elem, cur ) {
 }
 
 function cloneCopyEvent(orig, ret) {
-	var i = 0;
+	var node = 0;
 
 	ret.each(function() {
-		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+		if ( this.nodeType !== 1 || this.nodeName !== (orig[node] && orig[node].nodeName) ) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ),
+		var oldData = jQuery.data( orig[node++] ),
 			curData = jQuery.data( this, oldData ),
 			events = oldData && oldData.events;
 
@@ -386,8 +386,8 @@ function cloneCopyEvent(orig, ret) {
 			curData.events = {};
 
 			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( this, type, events[ type ][ i ], events[ type ][ i ].data );
 				}
 			}
 		}
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index d49029eb8..cbc0b7715 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -1,5 +1,8 @@
 module("manipulation");
 
+// Ensure that an extended Array prototype doesn't break jQuery
+Array.prototype.arrayProtoFn = function(arg) { throw("arrayProtoFn should not be called"); };
+
 var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 

From 91d32e8f9699022ee468c060a24a43f947653f69 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 13:06:41 +0100
Subject: [PATCH 005/110] Renamed jQuery.xhr.bindTransport as
 jQuery.xhr.transport. Generalized the implementation and made prefilters use
 the same logic. Cleaned up code and removed as many loops and each as
 possible.

---
 src/ajax.js              |   9 +-
 src/transports/jsonp.js  |  14 ++-
 src/transports/script.js |   2 +-
 src/transports/xhr.js    |   2 +-
 src/xhr.js               | 193 ++++++++++++++++++---------------------
 5 files changed, 103 insertions(+), 117 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index da130faed..320c13dd6 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -206,15 +206,16 @@ jQuery.extend({
 		// 2) These are called:
 		//    * BEFORE asking for a transport
 		//    * AFTER param serialization (s.data is a string if s.processData is true)
-		// 3) They MUST be order agnostic
-		prefilters: [],
+		// 3) key is the dataType
+		// 4) the catchall symbol "*" can be used
+		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
+		prefilters: {},
 		
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
-		transports: {
-		},
+		transports: {},
 		
 		// Checkers
 		// 1) key is dataType
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index d9e77f2f3..6c9fb704e 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -11,12 +11,14 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
-// 2) ensure transportDataType is json
+// 2) sneakily ensure transportDataType is json
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
-jQuery.xhr.prefilter( function(s) {
+jQuery.xhr.prefilter("json jsonp", function(s) {
 	
-	var transportDataType = s.dataTypes[0];
+	var transportDataType = s.dataTypes[ 0 ];
+	
+	s.dataTypes[ 0 ] = "json";
 	
 	if ( s.jsonp ||
 		transportDataType === "jsonp" ||
@@ -34,14 +36,10 @@ jQuery.xhr.prefilter( function(s) {
 		
 		s.url = url;
 		s.data = data;
-		
-		s.dataTypes[0] = "json";
 	}
 	
-});
-
 // Bind transport to json dataType
-jQuery.xhr.bindTransport("json", function(s) {
+}).transport("json", function(s) {
 
 	if ( s.jsonp ) {
 		
diff --git a/src/transports/script.js b/src/transports/script.js
index fe3873557..ebc2302b4 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -17,7 +17,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.bindTransport("script", function(s) {
+jQuery.xhr.transport("script", function(s) {
 	
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 783ee4604..978f6c259 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrUnloadAbortMarker = [];
 
 	
-jQuery.xhr.bindTransport( function( s , determineDataType ) {
+jQuery.xhr.transport( function( s , determineDataType ) {
 	
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
diff --git a/src/xhr.js b/src/xhr.js
index 5dd25b9a4..e792e1d47 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -87,13 +87,8 @@ jQuery.xhr = function( _native ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
 		
-		// Apply option prefilters
-		for (i in prefilters) {
-			prefilters[i](s);
-		}
-		
 		// Get internal
-		internal = selectTransport( s );
+		internal = jQuery.xhr.prefilter( s ).transport( s );
 		
 		// Re-actualize url & data
 		url = s.url;
@@ -606,100 +601,18 @@ jQuery.xhr = function( _native ) {
 	return xhr;
 };
 
-jQuery.extend(jQuery.xhr, {
-	
-	// Add new prefilter
-	prefilter: function (functor) {
-		if ( isFunction(functor) ) {
-			jQuery.ajaxSettings.prefilters.push( functor );
-		}
-		return this;
-	},
-	
-	// Bind a transport to one or more dataTypes
-	bindTransport: function () {
-		
-		var args = arguments,
-			i,
-			start = 0,
-			length = args.length,
-			dataTypes = [ "*" ],
-			functors = [],
-			functor,
-			first,
-			append,
-			list,
-			transports = jQuery.ajaxSettings.transports;
-			
-		if ( length ) {
-				
-			if ( ! isFunction( args[ 0 ] ) ) {
-				
-				dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-				start = 1;
-				
-			}
-			
-			if ( dataTypes.length && start < length ) {
-				
-				for ( i = start; i < length; i++ ) {
-					functor = args[i];
-					if ( isFunction(functor) ) {
-						functors.push( functor );
-					}
-				}
-						
-				if ( functors.length ) {
-							
-					jQuery.each ( dataTypes, function( _ , dataType ) {
-						
-						first = /^\+/.test( dataType );
-						
-						if (first) {
-							dataType = dataType.substr(1);
-						}
-						
-						if ( dataType !== "" ) {
-						
-							append = Array.prototype[ first ? "unshift" : "push" ];
-							
-							list = transports[ dataType ];
-					
-							jQuery.each ( functors, function( _ , functor ) {
-									
-								if ( ! list ) {
-									
-									list = transports[ dataType ] = [ functor ];
-									
-								} else {
-									
-									append.call( list , functor );
-								}
-							} );
-						}
-									
-					} );
-				}
-			}
-		}
-		
-		return this;
-	}
-
-	
-});
-
-// Select a transport given options
-function selectTransport( s ) {
+// Execute or select from functions in a given structure of options
+function xhr_selectOrExecute( structure , s ) {
 
 	var dataTypes = s.dataTypes,
 		transportDataType,
-		transportsList,
-		transport,
+		list,
+		selected,
 		i,
 		length,
 		checked = {},
-		flag;
+		flag,
+		noSelect = structure !== "transports";
 		
 	function initSearch( dataType ) {
 
@@ -709,9 +622,9 @@ function selectTransport( s ) {
 			
 			checked[ dataType ] = 1;
 			transportDataType = dataType;
-			transportsList = s.transports[ dataType ];
+			list = s[ structure ][ dataType ];
 			i = -1;
-			length = transportsList ? transportsList.length : 0 ;
+			length = list ? list.length : 0 ;
 		}
 
 		return flag;
@@ -719,7 +632,7 @@ function selectTransport( s ) {
 	
 	initSearch( dataTypes[ 0 ] );
 
-	for ( i = 0 ; ! transport && i <= length ; i++ ) {
+	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
 		
 		if ( i === length ) {
 			
@@ -727,21 +640,95 @@ function selectTransport( s ) {
 			
 		} else {
 
-			transport = transportsList[ i ]( s , determineDataType );
+			selected = list[ i ]( s , determineDataType );
 
 			// If we got redirected to another dataType
 			// Search there (if not in progress or already tried)
-			if ( typeof( transport ) === "string" &&
-				initSearch( transport ) ) {
+			if ( typeof( selected ) === "string" &&
+				initSearch( selected ) ) {
 
-				dataTypes.unshift( transport );
-				transport = 0;
+				dataTypes.unshift( selected );
+				selected = 0;
 			}
 		}
 	}
 
-	return transport;
+	return noSelect ? jQuery.xhr : selected;
 }
+
+// Add an element to one of the xhr structures in ajaxSettings
+function xhr_addElement( structure , args ) {
+		
+	var i,
+		j,
+		start = 0,
+		length = args.length,
+		dataTypes = [ "*" ],
+		dLength = 1,
+		dataType,
+		functors = [],
+		first,
+		append,
+		list;
+		
+	if ( length ) {
+		
+		first = jQuery.type( args[ 0 ] );
+		
+		if ( first === "object" ) {
+			return xhr_selectOrExecute( structure , args[ 0 ] );
+		}
+		
+		structure = jQuery.ajaxSettings[ structure ];
+		
+		if ( first !== "function" ) {
+			
+			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
+			dLength = dataTypes.length;
+			start = 1;
+			
+		}
+		
+		if ( dLength && start < length ) {
+			
+			functors = sliceFunc.call( args , start );
+			
+			length -= start;
+					
+			for( i = 0 ; i < dLength ; i++ ) {
+				
+				dataType = dataTypes[ i ];
+				
+				first = /^\+/.test( dataType );
+				
+				if (first) {
+					dataType = dataType.substr(1);
+				}
+				
+				if ( dataType !== "" ) {
+				
+					append = Array.prototype[ first ? "unshift" : "push" ];
+					
+					list = structure[ dataType ] = structure[ dataType ] || [];
+			
+					for ( j = 0; j < length; j++ ) {
+						append.call( list , functors[ j ] );
+					}
+				}
+			}
+		}
+	}
+	
+	return jQuery.xhr;
+}
+
+// Install prefilter & transport methods
+jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
+	_ = name + "s";
+	jQuery.xhr[ name ] = function() {
+		return xhr_addElement( _ , arguments );
+	};
+} );
 	
 // Utility function that handles dataType when response is received
 // (for those transports that can give text or xml responses)

From acab4ab0e50fadacb106468b1449643b9a03826b Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Tue, 21 Dec 2010 10:00:49 -0500
Subject: [PATCH 006/110] Use for loop instead of for/in loop to protect
 sanctity of Array.prototype. Fixes #7817. Test case for this commit is shared
 with the fix for #6355, https://github.com/jquery/jquery/pull/140 .

---
 src/xhr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xhr.js b/src/xhr.js
index 57903e046..4896e6cb6 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -87,7 +87,7 @@ jQuery.xhr = function( _native ) {
 		}
 		
 		// Apply option prefilters
-		for (i in prefilters) {
+		for ( i = 0; i < prefilters.length; i++ ) {
 			prefilters[i](s);
 		}
 		

From 1db2f02cc78b10bd638d70457645e1daa5c01344 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 16:58:52 +0100
Subject: [PATCH 007/110] Rewrote the data conversion logic in ajax. Should be
 cleaner and faster.

---
 src/ajax.js |  29 ++++-----
 src/xhr.js  | 165 ++++++++++++++++++++--------------------------------
 2 files changed, 76 insertions(+), 118 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 320c13dd6..a50a039dd 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -181,12 +181,7 @@ jQuery.extend({
 		xhr: function() {
 			return new window.XMLHttpRequest();
 		},
-		xhrResponseFields: {
-			xml: "XML",
-			text: "Text",
-			json: "JSON"
-		},
-			
+
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -194,13 +189,13 @@ jQuery.extend({
 			json: "application/json, text/javascript",
 			"*": "*/*"
 		},
-		
+
 		autoDataType: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
 		},
-		
+
 		// Prefilters
 		// 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
 		// 2) These are called:
@@ -210,26 +205,26 @@ jQuery.extend({
 		// 4) the catchall symbol "*" can be used
 		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
 		prefilters: {},
-		
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
-		
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
 		// 3) error throws is used as error data
 		dataCheckers: {
-	
+
 			// Check if data is a string
 			"text": function(data) {
 				if ( typeof data != "string" ) {
 					jQuery.error("typeerror");
 				}
 			},
-	
+
 			// Check if xml has been properly parsed
 			"xml": function(data) {
 				var documentElement = data ? data.documentElement : data;
@@ -241,25 +236,25 @@ jQuery.extend({
 				}
 			}
 		},
-		
+
 		// List of data converters
 		// 1) key format is "source_type => destination_type" (spaces required)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
-		
+
 			// Convert anything to text
 			"* => text": function(data) {
 				return "" + data;
 			},
-			
+
 			// Text to html (no transformation)
 			"text => html": function(data) {
 				return data;
 			},
-			
+
 			// Evaluate text as a json expression
 			"text => json": jQuery.parseJSON,
-			
+
 			// Parse text as xml
 			"text => xml": function(data) {
 				var xml, parser;
diff --git a/src/xhr.js b/src/xhr.js
index e792e1d47..1993e0b5d 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -7,9 +7,7 @@ var rquery_xhr = /\?/,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 	
-	sliceFunc = Array.prototype.slice,
-	
-	isFunction = jQuery.isFunction;
+	sliceFunc = Array.prototype.slice;
 	
 // Creates a jQuery xhr object
 jQuery.xhr = function( _native ) {
@@ -86,7 +84,7 @@ jQuery.xhr = function( _native ) {
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
-		
+
 		// Get internal
 		internal = jQuery.xhr.prefilter( s ).transport( s );
 		
@@ -147,7 +145,7 @@ jQuery.xhr = function( _native ) {
 				requestHeaders[ i.toLowerCase() ] = headers[ i ];
 			}			
 		}
-			
+		
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
 		
@@ -224,111 +222,76 @@ jQuery.xhr = function( _native ) {
 				// (if an exception is thrown in the process, it'll be notified as an error)
 				try {
 					
-					function checkData(data) {
-						if ( data !== undefined ) {
-							var testFunction = s.dataCheckers[srcDataType];
-							if ( isFunction( testFunction ) ) {
-								testFunction(data);
-							}
-						}
-					}
-					
-					function convertData (data) {
-						var conversionFunction = dataConverters[srcDataType+" => "+destDataType] ||
-								dataConverters["* => "+destDataType],
-							noFunction = ! isFunction( conversionFunction );
-						if ( noFunction ) {
-							if ( srcDataType != "text" && destDataType != "text" ) {
-								// We try to put text inbetween
-								var first = dataConverters[srcDataType+" => text"] ||
-										dataConverters["* => text"],
-									second = dataConverters["text => "+destDataType] ||
-										dataConverters["* => "+destDataType],
-									areFunctions = isFunction( first ) && isFunction( second );
-								if ( areFunctions ) {
-									conversionFunction = function (data) {
-										return second( first ( data ) );
-									};
-								}
-								noFunction = ! areFunctions;
-							}
-							if ( noFunction ) {
-								jQuery.error( "no data converter between " + srcDataType + " and " + destDataType );
-							}
-							
-						}
-						return conversionFunction(data);
-					}
-					
-					var dataTypes = s.dataTypes,
-						i,
-						length,
-						data = response,
+					var i,
+						current,
+						prev,
+						checker,
+						conv1,
+						conv2,
+						oneConv,
+						convertion,
+						dataTypes = s.dataTypes,
+						dataCheckers = s.dataCheckers,
 						dataConverters = s.dataConverters,
-						srcDataType,
-						destDataType,
-						responseTypes = s.xhrResponseFields;
+						dataFilter = s.dataFilter,
+						responses = {
+							"xml": "XML",
+							"text": "Text"
+						};
+					
+					for( i = 0 ; i < dataTypes.length ; i++ ) {
 						
-					for ( i = 0, length = dataTypes.length ; i < length ; i++ ) {
-	
-						destDataType = dataTypes[i];
+						current = dataTypes[ i ];
 						
-						if ( !srcDataType ) { // First time
+						if ( i ) {
 							
-							// Copy type
-							srcDataType = destDataType;
-							// Check
-							checkData(data);
-							// Apply dataFilter
-							if ( isFunction( s.dataFilter ) ) {
-								data = s.dataFilter(data, s.dataType);
-								// Recheck data
-								checkData(data);
+							prev = dataTypes[ i - 1 ];
+							
+							if ( prev === "*" ) {
+								
+								prev = current;
+								
+							} else if ( current !== "*" && prev !== current ) {
+							
+								oneConv = conv1 = 
+									dataConverters[ ( conversion = prev + " => " + current ) ] ||
+									dataConverters[ "* => " + current ];
+								
+								if ( ! oneConv && prev !== "text" && current !== "text" ) {
+									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
+									conv2 = dataConverters[ "text => " + current ];
+								}
+								if ( oneConv || conv1 && conv2 ) {
+									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+								} else {
+									throw "no " + conversion;
+								}
 							}
-							
-						} else { // Subsequent times
-							
-							// handle auto
-							// JULIAN: for reasons unknown to me === doesn't work here
-							if (destDataType == "*") {
-	
-								destDataType = srcDataType;
-								
-							} else if ( srcDataType != destDataType ) {
-								
-								// Convert
-								data = convertData(data);
-								// Copy type & check
-								srcDataType = destDataType;
-								checkData(data);
-								
-							}
-							
-						}
-	
-						// Copy response into the xhr if it hasn't been already
-						var responseDataType,
-							responseType = responseTypes[srcDataType];
-						
-						if ( responseType ) {
-							
-							responseDataType = srcDataType;
-							
-						} else {
-							
-							responseType = responseTypes[ responseDataType = "text" ];
-							
-						}
-							
-						if ( responseType !== 1 ) {
-							xhr[ "response" + responseType ] = data;
-							responseTypes[ responseType ] = 1;
 						}
 						
+						checker = dataCheckers[ current ];
+						
+						if ( response != null && checker ) {
+							checker( response );
+						}
+						
+						if ( responses[ current ] ) {
+							xhr[ "response" + responses[ current ] ] = response;
+							responses[ current ] = 0;
+						}
+						
+						if ( ! i && dataFilter ) {
+							
+							response = dataFilter( response );
+							
+							dataTypes = s.dataTypes;
+							dataFilter = 0;
+							i--;
+						}
 					}
 	
 					// We have a real success
-					success = data;
+					success = response;
 					isSuccess = 1;
 					
 				} catch(e) {
@@ -406,7 +369,7 @@ jQuery.xhr = function( _native ) {
 	// Ready state change
 	function setState( value ) {
 		xhr.readyState = value;
-		if ( isFunction( xhr.onreadystatechange ) ) {
+		if ( jQuery.isFunction( xhr.onreadystatechange ) ) {
 			xhr.onreadystatechange();
 		}
 	}

From c810c62a67ca91785b214ce54950a1fc12592ef1 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 17:04:07 +0100
Subject: [PATCH 008/110] Removed NFE to make old Safari happy and avoid leaks
 in IE (as per David Murdoch's warning).

---
 src/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index 39d49743c..4c717e3b9 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function then() {
+				then: function () {
 					
 					if ( ! cancelled ) {
 					
@@ -820,7 +820,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								then.apply( this , elem );
+								deferred.then.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}

From 7f617e0c9f39d5cc608a05f808e6defade498fda Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 09:13:28 -0600
Subject: [PATCH 009/110] Fix a potential error in the previous commit caused
 by the use of a separate index variable.

---
 src/manipulation.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/manipulation.js b/src/manipulation.js
index c23f62ed1..203d2ef72 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -370,14 +370,18 @@ function root( elem, cur ) {
 }
 
 function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) || !jQuery.hasData(orig[i]) ) {
+	ret.each(function (nodeIndex) {
+		if ( this.nodeType !== 1 || !jQuery.hasData(orig[nodeIndex]) ) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ),
+		// XXX remove for 1.5 RC or merge back in if there is actually a reason for this check that has been
+		// unexposed by unit tests
+		if ( this.nodeName !== (orig[nodeIndex] && orig[nodeIndex].nodeName) ) {
+			throw "Cloned data mismatch";
+		}
+
+		var oldData = jQuery.data( orig[nodeIndex] ),
 			curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
 			events = oldData && oldData.events;
 

From 5607bd8d53c5086bedb702f71dee02543cc7056a Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 09:13:28 -0600
Subject: [PATCH 010/110] Fix a potential error in the previous commit caused
 by the use of a separate index variable. Thanks to dmethvin for the review.

---
 src/manipulation.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/manipulation.js b/src/manipulation.js
index c23f62ed1..203d2ef72 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -370,14 +370,18 @@ function root( elem, cur ) {
 }
 
 function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) || !jQuery.hasData(orig[i]) ) {
+	ret.each(function (nodeIndex) {
+		if ( this.nodeType !== 1 || !jQuery.hasData(orig[nodeIndex]) ) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ),
+		// XXX remove for 1.5 RC or merge back in if there is actually a reason for this check that has been
+		// unexposed by unit tests
+		if ( this.nodeName !== (orig[nodeIndex] && orig[nodeIndex].nodeName) ) {
+			throw "Cloned data mismatch";
+		}
+
+		var oldData = jQuery.data( orig[nodeIndex] ),
 			curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
 			events = oldData && oldData.events;
 

From 445fdf720ce26b99aadace85b7ec976f90583c3a Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 14:43:17 -0600
Subject: [PATCH 011/110] Remove code for ticket #7717 which has been marked
 WONTFIX to match existing $.data functionality and to prevent infinite loops
 caused by circular references.

---
 src/manipulation.js       |  2 +-
 test/unit/manipulation.js | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/manipulation.js b/src/manipulation.js
index 203d2ef72..3b9aa1462 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -382,7 +382,7 @@ function cloneCopyEvent(orig, ret) {
 		}
 
 		var oldData = jQuery.data( orig[nodeIndex] ),
-			curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
+			curData = jQuery.data( this, oldData ),
 			events = oldData && oldData.events;
 
 		if ( events ) {
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 52f76ed69..ba57a6f91 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -924,16 +924,12 @@ test("clone()", function() {
 	equals( clone.html(), div.html(), "Element contents cloned" );
 	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 
-	div = jQuery("<div/>").data({
-		a: true, b: true,
-		c: { nesty: ["Block", "Head"] }
-	});
+	div = jQuery("<div/>").data({ a: true });
 	var div2 = div.clone(true);
 	equals( div2.data("a"), true, "Data cloned." );
-	equals( div2.data("b"), true, "Data cloned." );
-	var c = div2.data("c");
-	c.nesty[0] = "Fish";
-	equals( div.data("c").nesty[0], "Block", "Ensure cloned element data is deep copied (Bug #7717)" );
+	div2.data("a", false);
+	equals( div2.data("a"), false, "Ensure cloned element data object was correctly modified" );
+	equals( div.data("a"), true, "Ensure cloned element data object is copied, not referenced" );
 
 	var form = document.createElement("form");
 	form.action = "/test/";

From f5d4bf8920868c2d1f88cc4f3bfcf85c0b566b2e Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 14:54:37 -0600
Subject: [PATCH 012/110] Update jQuery.hasData to always return a boolean,
 with unit tests.

---
 src/data.js       |  2 +-
 test/unit/data.js | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/data.js b/src/data.js
index 120fe718d..c3530c835 100644
--- a/src/data.js
+++ b/src/data.js
@@ -22,7 +22,7 @@ jQuery.extend({
 	},
 
 	hasData: function( elem ) {
-		return !elem.nodeType || (elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
+		return !elem.nodeType || (!!elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
 	},
 
 	data: function( elem, name, data ) {
diff --git a/test/unit/data.js b/test/unit/data.js
index 1a0f84c1f..204d979c3 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -78,6 +78,15 @@ test("jQuery.data", function() {
 	ok( jQuery.data( window, "BAD" ), "Make sure that the value was set." );
 });
 
+test("jQuery.hasData", function() {
+	var div = document.createElement( "div" );
+	equals( jQuery.hasData(div), false, "No data exists" );
+	jQuery.data( div, "foo", "bar" );
+	equals( jQuery.hasData(div), true, "Data exists" );
+	jQuery.removeData( div, "foo" );
+	equals( jQuery.hasData(div), false, "Data was removed" );
+});
+
 test(".data()", function() {
 	expect(5);
 
@@ -180,7 +189,7 @@ test(".data(String) and .data(String, Object)", function() {
 	equals( $elem.data('emptyString','').data('emptyString'), '', "Empty strings are preserved");
 	equals( $elem.data('false',false).data('false'), false, "false's are preserved");
 	equals( $elem.data('exists'), true, "Existing data is returned" );
-	
+
 	// Clean up
 	$elem.removeData();
 	ok( jQuery.isEmptyObject( $elem[0] ), "removeData clears the object" );
@@ -191,7 +200,7 @@ test("data-* attributes", function() {
 	var div = jQuery("<div>"),
 		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>"),
 		dummy = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>");
-		
+
 	equals( div.data("attr"), undefined, "Check for non-existing data-attr attribute" );
 
 	div.attr("data-attr", "exists");
@@ -199,10 +208,10 @@ test("data-* attributes", function() {
 
 	div.attr("data-attr", "exists2");
 	equals( div.data("attr"), "exists", "Check that updates to data- don't update .data()" );
-		
+
 	div.data("attr", "internal").attr("data-attr", "external");
 	equals( div.data("attr"), "internal", "Check for .data('attr') precedence (internal > external data-* attribute)" );
-	
+
 	child.appendTo('#main');
 	equals( child.data("myobj"), "old data", "Value accessed from data-* attribute");
 
@@ -249,7 +258,7 @@ test("data-* attributes", function() {
 		.attr("data-space", " ")
 		.attr("data-null", "null")
 		.attr("data-string", "test");
-	
+
 	strictEqual( child.data('true'), true, "Primitive true read from attribute");
 	strictEqual( child.data('false'), false, "Primitive false read from attribute");
 	strictEqual( child.data('five'), 5, "Primitive number read from attribute");
@@ -265,7 +274,7 @@ test("data-* attributes", function() {
 	strictEqual( child.data('string'), "test", "Typical string read from attribute");
 
 	child.remove();
-	
+
 	// tests from metadata plugin
 	function testData(index, elem) {
 		switch (index) {
@@ -289,10 +298,10 @@ test("data-* attributes", function() {
 			ok(false, ["Assertion failed on index ", index, ", with data ", data].join(''));
 		}
 	}
-	
+
 	var metadata = '<ol><li class="test test2" data-foo="bar" data-bar="baz" data-arr="[1,2]">Some stuff</li><li class="test test2" data-test="bar" data-bar="baz">Some stuff</li><li class="test test2" data-zoooo="bar" data-bar=\'{"test":"baz"}\'>Some stuff</li><li class="test test2" data-number=true data-stuff="[2,8]">Some stuff</li></ol>',
 		elem = jQuery(metadata).appendTo('#main');
-	
+
 	elem.find("li").each(testData);
 	elem.remove();
 });
@@ -305,12 +314,12 @@ test(".data(Object)", function() {
 	div.data({ "test": "in", "test2": "in2" });
 	equals( div.data("test"), "in", "Verify setting an object in data" );
 	equals( div.data("test2"), "in2", "Verify setting an object in data" );
-	
+
 	var obj = {test:"unset"},
 		jqobj = jQuery(obj);
 	jqobj.data({ "test": "in", "test2": "in2" });
 	equals( obj.test, "in", "Verify setting an object on an object extends the object" );
-	equals( obj.test2, "in2", "Verify setting an object on an object extends the object" );	
+	equals( obj.test2, "in2", "Verify setting an object on an object extends the object" );
 });
 
 test("jQuery.removeData", function() {
@@ -324,13 +333,13 @@ test("jQuery.removeData", function() {
 	jQuery.removeData( div );
 	ok( !jQuery.data(div, "test2"), "Make sure that the data property no longer exists." );
 	ok( !div[ jQuery.expando ], "Make sure the expando no longer exists, as well." );
-	
+
 	var obj = {};
 	jQuery.data(obj, "test", "testing");
 	equals( obj.test, "testing", "verify data on plain object");
 	jQuery.removeData(obj, "test");
 	equals( jQuery.data(obj, "test"), undefined, "Check removal of data on plain object" );
-	equals( obj.test, undefined, "Check removal of data directly from plain object" );	
+	equals( obj.test, undefined, "Check removal of data directly from plain object" );
 
 	jQuery.data( window, "BAD", true );
 	jQuery.removeData( window, "BAD" );

From e199ead4cba3687beca2444eea4bb8abc20f55b6 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 15:03:01 -0600
Subject: [PATCH 013/110] More unit tests and a $.hasData that works for JS
 objects too.

---
 src/data.js       |  6 +++++-
 test/unit/data.js | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/data.js b/src/data.js
index c3530c835..549e73ed4 100644
--- a/src/data.js
+++ b/src/data.js
@@ -22,7 +22,11 @@ jQuery.extend({
 	},
 
 	hasData: function( elem ) {
-		return !elem.nodeType || (!!elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
+		if (elem.nodeType) {
+			elem = jQuery.cache[ elem[jQuery.expando] ];
+		}
+
+		return !!elem && !jQuery.isEmptyObject(elem);
 	},
 
 	data: function( elem, name, data ) {
diff --git a/test/unit/data.js b/test/unit/data.js
index 204d979c3..310cd6bc4 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -79,12 +79,18 @@ test("jQuery.data", function() {
 });
 
 test("jQuery.hasData", function() {
-	var div = document.createElement( "div" );
-	equals( jQuery.hasData(div), false, "No data exists" );
-	jQuery.data( div, "foo", "bar" );
-	equals( jQuery.hasData(div), true, "Data exists" );
-	jQuery.removeData( div, "foo" );
-	equals( jQuery.hasData(div), false, "Data was removed" );
+	expect(6);
+
+	function testData(obj) {
+		equals( jQuery.hasData(obj), false, "No data exists" );
+		jQuery.data( obj, "foo", "bar" );
+		equals( jQuery.hasData(obj), true, "Data exists" );
+		jQuery.removeData( obj, "foo" );
+		equals( jQuery.hasData(obj), false, "Data was removed" );
+	}
+
+	testData(document.createElement('div'));
+	testData({});
 });
 
 test(".data()", function() {

From a2bf7ab3c002e921aa1d4c9be9d0f337dfd4143d Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 18:17:58 -0600
Subject: [PATCH 014/110] Code style fix

---
 src/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data.js b/src/data.js
index 549e73ed4..21b7543ca 100644
--- a/src/data.js
+++ b/src/data.js
@@ -22,7 +22,7 @@ jQuery.extend({
 	},
 
 	hasData: function( elem ) {
-		if (elem.nodeType) {
+		if ( elem.nodeType ) {
 			elem = jQuery.cache[ elem[jQuery.expando] ];
 		}
 

From 1f92edee207829a28de80ee72548cdbd599bcc79 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 22 Dec 2010 18:54:22 -0600
Subject: [PATCH 015/110] Fix fix for #6481 introduced at
 7862c45ad2f32096383a21b8b301155787724476 which did not like it when
 Array.prototype was modified on empty arrays.

---
 src/ajax.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ajax.js b/src/ajax.js
index da130faed..3f4f732bd 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -343,7 +343,9 @@ function buildParams( prefix, obj, traditional, add ) {
 		});
 			
 	} else if ( !traditional && obj != null && typeof obj === "object" ) {
-		if ( jQuery.isEmptyObject( obj ) ) {
+		// If we see an array here, it is empty and should be treated as an empty
+		// object
+		if ( jQuery.isArray( obj ) || jQuery.isEmptyObject( obj ) ) {
 			add( prefix, "" );
 
 		// Serialize object item.

From 116c82b027a03a7a5670fa580fa9af819cc1cc03 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Mon, 20 Dec 2010 19:09:15 +0100
Subject: [PATCH 016/110] Added deferred to core. Used internally for DOM
 readyness and ajax callbacks.

---
 src/core.js       | 208 +++++++++++++++++++++++++++++++-------
 src/xhr.js        | 171 +++++--------------------------
 test/unit/core.js | 250 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 450 insertions(+), 179 deletions(-)

diff --git a/src/core.js b/src/core.js
index 346e52d70..f7713ca82 100644
--- a/src/core.js
+++ b/src/core.js
@@ -60,8 +60,8 @@ var jQuery = function( selector, context ) {
 	// Has the ready events already been bound?
 	readyBound = false,
 	
-	// The functions to execute on DOM ready
-	readyList = [],
+	// The deferred used on DOM ready
+	readyList,
 
 	// The ready event handler
 	DOMContentLoaded,
@@ -75,7 +75,10 @@ var jQuery = function( selector, context ) {
 	indexOf = Array.prototype.indexOf,
 	
 	// [[Class]] -> type pairs
-	class2type = {};
+	class2type = {},
+	
+	// Marker for deferred
+	deferredMarker = [];
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -253,22 +256,12 @@ jQuery.fn = jQuery.prototype = {
 		return jQuery.each( this, callback, args );
 	},
 	
-	ready: function( fn ) {
+	ready: function() {
 		// Attach the listeners
 		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
+		
+		// Change ready & apply
+		return ( jQuery.fn.ready = readyList.then ).apply( this , arguments );
 	},
 	
 	eq: function( i ) {
@@ -415,23 +408,11 @@ jQuery.extend({
 			}
 
 			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn,
-					i = 0,
-					ready = readyList;
-
-				// Reset the list of functions
-				readyList = null;
-
-				while ( (fn = ready[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Trigger any bound ready events
-				if ( jQuery.fn.trigger ) {
-					jQuery( document ).trigger( "ready" ).unbind( "ready" );
-				}
+			readyList.fire( document , [ jQuery ] );
+			
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
 			}
 		}
 	},
@@ -800,6 +781,160 @@ jQuery.extend({
 	now: function() {
 		return (new Date()).getTime();
 	},
+	
+	// Create a simple deferred (one callbacks list)
+	_deferred: function( cancellable ) {
+		
+		// cancellable by default
+		cancellable = cancellable !== false;
+		
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+				
+				// then( f1, f2, ...)
+				then: function() {
+					
+					if ( ! cancelled ) {
+					
+						var args = arguments,
+							i,
+							type,
+							_fired;
+							
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						
+						for ( i in args ) {
+							i = args[ i ];
+							type = jQuery.type( i );
+							if ( type === "array" ) {
+								this.then.apply( this , i );
+							} else if ( type === "function" ) {
+								callbacks.push( i );
+							}
+						}
+						
+						if ( _fired ) {
+							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+				
+				// resolve with given context and args
+				// (i is used internally)
+				fire: function( context , args , i ) {
+					if ( ! cancelled && ! fired && ! firing ) {
+						firing = 1;
+						try {
+							for( i = 0 ; ! cancelled && callbacks[ i ] ; i++ ) {
+								cancelled = ( callbacks[ i ].apply( context , args ) === false ) && cancellable;
+							}
+						} catch( e ) {
+							cancelled = cancellable;
+							jQuery.error( e );
+						} finally {
+							fired = [ context , args ];
+							callbacks = cancelled ? [] : callbacks.slice( i + 1 );
+							firing = 0;
+						}
+					}
+					return this;
+				},
+				
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.fire( this , arguments );
+					return this;
+				},
+				
+				// cancelling further callbacks
+				cancel: function() {
+					if ( cancellable ) {
+						callbacks = [];
+						cancelled = 1;
+					}
+					return this;
+				}
+				
+			};
+		
+		// Add the deferred marker
+		deferred.then._ = deferredMarker;
+		
+		return deferred;
+	},
+	
+	// Full fledged deferred (two callbacks list)
+	// Typical success/error system
+	deferred: function( func , cancellable ) {
+		
+		// Handle varargs
+		if ( arguments.length === 1 ) {
+			
+			if ( typeof func === "boolean" ) {
+				cancellable = func;
+				func = 0;
+			}
+		}
+		
+		var errorDeferred = jQuery._deferred( cancellable ),
+			deferred = jQuery._deferred( cancellable ),
+			// Keep reference of the cancel method since we'll redefine it
+			cancelThen = deferred.cancel;
+			
+		// Add errorDeferred methods and redefine cancel			
+		jQuery.extend( deferred , {
+
+				fail: errorDeferred.then,
+				fireReject: errorDeferred.fire,
+				reject: errorDeferred.resolve,
+				cancel: function() {
+					cancelThen();
+					errorDeferred.cancel();
+					return this;
+				}
+
+		} );
+		
+		// Make sure only one callback list will be used
+		deferred.then( errorDeferred.cancel ).fail( cancelThen );
+		
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred , deferred );
+		}
+		
+		return deferred;
+	},
+
+	// Check if an object is a deferred
+	isDeferred: function( object , method ) {
+		method = method || "then";
+		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	},
+	
+	// Deferred helper
+	when: function( object , method ) {
+		method = method || "then";
+		object = jQuery.isDeferred( object , method ) ?
+			object :
+			jQuery.deferred().resolve( object );
+		object.fail = object.fail || function() { return this; };
+		object[ method ] = object[ method ] || object.then;
+		object.then = object.then || object[ method ];
+		return object;
+	},
 
 	// Use of jQuery.browser is frowned upon.
 	// More details: http://docs.jquery.com/Utilities/jQuery.browser
@@ -818,6 +953,11 @@ jQuery.extend({
 	browser: {}
 });
 
+// Create readyList deferred
+// also force $.fn.ready to be recognized as a defer
+readyList = jQuery._deferred( false );
+jQuery.fn.ready._ = deferredMarker;
+
 // Populate the class2type map
 jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
diff --git a/src/xhr.js b/src/xhr.js
index 4896e6cb6..8e9a2b08a 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -18,18 +18,19 @@ jQuery.xhr = function( _native ) {
 		return jQuery.ajaxSettings.xhr();
 	}
 	
-	function reset(force) {
+	function reset( force ) {
 		
 		// We only need to reset if we went through the init phase
 		// (with the exception of object creation)
 		if ( force || internal ) {
-		
+			
 			// Reset callbacks lists
-			callbacksLists = {
-				success: createCBList(),
-				error: createCBList(),
-				complete: createCBList()
-			};
+			deferred = jQuery.deferred();
+			completeDeferred = jQuery._deferred();
+			
+			xhr.success = xhr.then = deferred.then;
+			xhr.error = xhr.fail = deferred.fail;
+			xhr.complete = completeDeferred.then;
 			
 			// Reset private variables
 			requestHeaders = {};
@@ -155,8 +156,8 @@ jQuery.xhr = function( _native ) {
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
 		
-		for ( i in callbacksLists ) {
-			callbacksLists[i].bind(s[i]);
+		for ( i in { success:1, error:1, complete:1 } ) {
+			xhr[ i ]( s[ i ] );
 		}
 		
 		// Watch for a new set of requests
@@ -355,10 +356,12 @@ jQuery.xhr = function( _native ) {
 		
 		// Keep local copies of vars in case callbacks re-use the xhr
 		var _s = s,
-			_callbacksLists = callbacksLists,
+			_deferred = deferred,
+			_completeDeferred = completeDeferred,
 			_callbackContext = callbackContext,
 			_globalEventContext = globalEventContext;
 			
+			
 		// Set state if the xhr hasn't been re-used
 		function _setState( value ) {
 			if ( xhr.readyState && s === _s ) {
@@ -375,18 +378,20 @@ jQuery.xhr = function( _native ) {
 		// We're done
 		_setState( 4 );
 		
-		// Success
-		_callbacksLists.success.fire( isSuccess , _callbackContext , success, statusText, xhr);
-		if ( isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxSuccess", [xhr, _s, success] );
+		// Success/Error
+		if ( isSuccess ) {
+			_deferred.fire( _callbackContext , [ success , statusText , xhr ] );
+		} else {
+			_deferred.fireReject( _callbackContext , [ xhr , statusText , error ] );
 		}
-		// Error
-		_callbacksLists.error.fire( ! isSuccess , _callbackContext , xhr, statusText, error);
-		if ( !isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxError", [xhr, _s, error] );	
+		
+		if ( _s.global ) {
+			_globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , [ xhr , _s , isSuccess ? success : error ] );
 		}
+		
 		// Complete
-		_callbacksLists.complete.fire( 1 , _callbackContext, xhr, statusText);
+		_completeDeferred.fire( _callbackContext, [ xhr , statusText ] );
+		
 		if ( _s.global ) {
 			_globalEventContext.trigger( "ajaxComplete", [xhr, _s] );
 			// Handle the global AJAX counter
@@ -419,7 +424,8 @@ jQuery.xhr = function( _native ) {
 		// Callback stuff
 		callbackContext,
 		globalEventContext,
-		callbacksLists,
+		deferred,
+		completeDeferred,
 		// Headers (they are sent all at once)
 		requestHeaders,
 		// Response headers
@@ -596,135 +602,10 @@ jQuery.xhr = function( _native ) {
 	// Init data (so that we can bind callbacks early
 	reset(1);
 
-	// Install callbacks related methods
-	jQuery.each(callbacksLists, function(name) {
-		var list;
-		xhr[name] = function() {
-			list = callbacksLists[name];
-			if ( list ) {
-				list.bind.apply(list, arguments );
-			}
-			return this;
-		};
-	});
-	
 	// Return the xhr emulation
 	return xhr;
 };
 
-// Create a callback list
-function createCBList() {
-	
-	var functors = [],
-		autoFire = 0,
-		fireArgs,
-		list = {
-		
-			fire: function( flag , context ) {
-				
-				// Save info for later bindings
-				fireArgs = arguments;
-				
-				// Remove autoFire to keep bindings in order
-				autoFire = 0;
-					
-				var args = sliceFunc.call( fireArgs , 2 );
-					
-				// Execute callbacks
-				while ( flag && functors.length ) {
-					flag = functors.shift().apply( context , args ) !== false;
-				}
-					
-				// Clean if asked to stop
-				if ( ! flag ) {
-					clean();
-				}
-						
-				// Set autoFire
-				autoFire = 1;					
-			},
-			
-			bind: function() {
-				
-				var args = arguments,
-					i = 0,
-					length = args.length,
-					func;
-				
-				for ( ; i < length ; i++ ) {
-					
-					func = args[ i ];
-					
-					if ( jQuery.isArray(func) ) {
-						
-						list.bind.apply( list , func );
-						
-					} else if ( isFunction(func) ) {
-						
-						// Add if not already in
-						if ( ! pos( func ) ) {
-							functors.push( func );
-						}
-					}
-				}
-				
-				if ( autoFire ) {
-					list.fire.apply( list , fireArgs );
-				}
-			},
-			
-			unbind: function() {
-				
-				var i = 0,
-					args = arguments,
-					length = args.length,
-					func,					
-					position;
-					
-				if ( length ) {
-						
-					for( ; i < length ; i++ ) {
-						func = args[i];
-						if ( jQuery.isArray(func) ) {
-							list.unbind.apply(list,func);
-						} else if ( isFunction(func) ) {
-							position = pos(func);
-							if ( position ) {
-								functors.splice(position-1,1);
-							}
-						}
-					}
-				
-				} else {
-					
-					functors = [];
-				
-				}
-
-			}
-			
-		};
-
-	// Get the index of the functor in the list (1-based)
-	function pos( func ) {
-		for (var i = 0, length = functors.length; i < length && functors[i] !== func; i++) {
-		}
-		return i < length ? ( i + 1 ) : 0;
-	}
-		
-	// Clean the object
-	function clean() {
-		// Empty callbacks list
-		functors = [];
-		// Inhibit methods
-		for (var i in list) {
-			list[i] = jQuery.noop;
-		}
-	}
-				
-	return list;
-}
-
 jQuery.extend(jQuery.xhr, {
 	
 	// Add new prefilter
diff --git a/test/unit/core.js b/test/unit/core.js
index 705778370..f4117247a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -902,3 +902,253 @@ test("jQuery.parseJSON", function(){
 		ok( true, "Test malformed JSON string." );
 	}
 });
+
+test("jQuery._deferred()", function() {
+	
+	expect( 14 );
+	
+	var deferred,
+		object,
+		test;
+	
+	deferred = jQuery._deferred();
+		
+	test = false;
+		
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test pre-resolve callback" );
+		test = true;
+	} );
+	
+	deferred.resolve( "value" );
+	
+	ok( test , "Test pre-resolve callbacks called right away" );
+
+	test = false;
+	
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test post-resolve callback" );
+		test = true;
+	} );
+	
+	ok( test , "Test post-resolve callbacks called right away" );
+	
+	deferred.cancel();
+	
+	test = true;
+	
+	deferred.then( function() {
+		ok( false , "Manual cancel was ignored" );
+		test = false;
+	} );
+	
+	ok( test , "Test manual cancel" );
+	
+	deferred = jQuery._deferred().then( function() {
+		return false;
+	} );
+	
+	deferred.resolve();
+	
+	test = true;
+	
+	deferred.then( function() {
+		test = false;
+	} );
+	
+	ok( test , "Test cancel by returning false" );
+
+	try {
+		deferred = jQuery._deferred().resolve().then( function() {
+			throw "Error";
+		} , function() {
+			ok( false , "Test deferred cancel on exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	test = "";
+	deferred = jQuery._deferred().then( function() {
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+		
+	} ).resolve();
+	
+	strictEqual( test , "AB" , "Test multiple then parameters" );
+	
+	test = "";
+	
+	deferred.then( function() {
+		
+		deferred.then( function() {
+			
+			test += "C";
+			
+		} );
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+	} );
+	
+	strictEqual( test , "ABC" , "Test then callbacks order" );
+	
+	deferred = jQuery._deferred( false ).resolve().cancel();
+	
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled manually");
+		return false;
+	} );
+
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled by returning false");
+	} );
+	
+	try {
+		deferred.then( function() {
+			throw "Error";
+		} , function() {
+			ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	deferred = jQuery._deferred();
+	
+	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
+		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
+	});
+});
+
+test("jQuery.deferred()", function() {
+	
+	expect( 8 );
+	
+	jQuery.deferred( function( defer ) {
+		strictEqual( this , defer , "Defer passed as this & first argument" );
+		this.resolve( "done" );
+	}).then( function( value ) {
+		strictEqual( value , "done" , "Passed function executed" );
+	});
+	
+	jQuery.deferred().resolve().then( function() {
+		ok( true , "Success on resolve" );
+	}).fail( function() {
+		ok( false , "Error on resolve" );
+	});
+	
+	jQuery.deferred().reject().then( function() {
+		ok( false , "Success on reject" );
+	}).fail( function() {
+		ok( true , "Error on reject" );
+	});
+	
+	var flag = true;
+	
+	jQuery.deferred().resolve().cancel().then( function() {
+		ok( flag = false , "Success on resolve/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on resolve/cancel" );
+	});
+	
+	ok( flag , "Cancel on resolve" );
+	
+	flag = true;
+	
+	jQuery.deferred().reject().cancel().then( function() {
+		ok( flag = false , "Success on reject/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on reject/cancel" );
+	});
+	
+	ok( flag , "Cancel on reject" );
+	
+	jQuery.deferred( false ).resolve().then( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on resolve" );
+	});
+	
+	jQuery.deferred( false ).reject().fail( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on reject" );
+	});
+	
+});
+	
+test("jQuery.isDeferred()", function() {
+	
+	expect( 11 );
+	
+	var object1 = { then: function() { return this; } },
+		object2 = { then: function() { return this; } };
+		
+	object2.then._ = [];
+	
+	// The use case that we want to match
+	ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
+	ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
+	
+	// Some other objects
+	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
+	ok(!jQuery.isDeferred(object2), "Object with then & marker");
+	
+	// Not objects shouldn't be matched
+	ok(!jQuery.isDeferred(""), "string");
+	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
+	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
+	ok(!jQuery.isDeferred(null), "null");
+	ok(!jQuery.isDeferred(undefined), "undefined");
+	
+	object1 = {custom: jQuery._deferred().then};
+	
+	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
+	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
+});
+
+test("jQuery.when()", function() {
+	
+	expect( 5 );
+	
+	var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
+	
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || jQuery.deferred( function() {
+			this.resolve( i );
+		}) ).then( function( value ) {
+			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Fail called" );
+		});
+	}
+	
+	cache = 0;
+
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || deferred , "done" ).done( function( value ) {
+			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Custom method: fail called" );
+		});
+	}
+	
+	stop();
+	
+	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
+		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
+		start();
+	});
+});

From 56628c7adffb4b5436257255f55e31b85b58aa8f Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 00:56:00 +0100
Subject: [PATCH 017/110] Fixed a loop that only worked in webkit.

---
 src/core.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/core.js b/src/core.js
index f7713ca82..39d49743c 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,12 +800,14 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function() {
+				then: function then() {
 					
 					if ( ! cancelled ) {
 					
 						var args = arguments,
 							i,
+							length,
+							elem,
 							type,
 							_fired;
 							
@@ -814,13 +816,13 @@ jQuery.extend({
 							fired = 0;
 						}
 						
-						for ( i in args ) {
-							i = args[ i ];
-							type = jQuery.type( i );
+						for ( i = 0, length = args.length ; i < length ; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								this.then.apply( this , i );
+								then.apply( this , elem );
 							} else if ( type === "function" ) {
-								callbacks.push( i );
+								callbacks.push( elem );
 							}
 						}
 						

From 0daf7223d08e2da983179e37e6c422abe90d6b82 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 13:06:41 +0100
Subject: [PATCH 018/110] Renamed jQuery.xhr.bindTransport as
 jQuery.xhr.transport. Generalized the implementation and made prefilters use
 the same logic. Cleaned up code and removed as many loops and each as
 possible.

---
 src/ajax.js              |   9 +-
 src/transports/jsonp.js  |  14 ++-
 src/transports/script.js |   2 +-
 src/transports/xhr.js    |   2 +-
 src/xhr.js               | 195 ++++++++++++++++++---------------------
 5 files changed, 104 insertions(+), 118 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 3f4f732bd..258694c81 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -206,15 +206,16 @@ jQuery.extend({
 		// 2) These are called:
 		//    * BEFORE asking for a transport
 		//    * AFTER param serialization (s.data is a string if s.processData is true)
-		// 3) They MUST be order agnostic
-		prefilters: [],
+		// 3) key is the dataType
+		// 4) the catchall symbol "*" can be used
+		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
+		prefilters: {},
 		
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
-		transports: {
-		},
+		transports: {},
 		
 		// Checkers
 		// 1) key is dataType
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index d9e77f2f3..6c9fb704e 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -11,12 +11,14 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
-// 2) ensure transportDataType is json
+// 2) sneakily ensure transportDataType is json
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
-jQuery.xhr.prefilter( function(s) {
+jQuery.xhr.prefilter("json jsonp", function(s) {
 	
-	var transportDataType = s.dataTypes[0];
+	var transportDataType = s.dataTypes[ 0 ];
+	
+	s.dataTypes[ 0 ] = "json";
 	
 	if ( s.jsonp ||
 		transportDataType === "jsonp" ||
@@ -34,14 +36,10 @@ jQuery.xhr.prefilter( function(s) {
 		
 		s.url = url;
 		s.data = data;
-		
-		s.dataTypes[0] = "json";
 	}
 	
-});
-
 // Bind transport to json dataType
-jQuery.xhr.bindTransport("json", function(s) {
+}).transport("json", function(s) {
 
 	if ( s.jsonp ) {
 		
diff --git a/src/transports/script.js b/src/transports/script.js
index fe3873557..ebc2302b4 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -17,7 +17,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.bindTransport("script", function(s) {
+jQuery.xhr.transport("script", function(s) {
 	
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 783ee4604..978f6c259 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrUnloadAbortMarker = [];
 
 	
-jQuery.xhr.bindTransport( function( s , determineDataType ) {
+jQuery.xhr.transport( function( s , determineDataType ) {
 	
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
diff --git a/src/xhr.js b/src/xhr.js
index 8e9a2b08a..208a734b4 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -86,14 +86,9 @@ jQuery.xhr = function( _native ) {
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
-		
-		// Apply option prefilters
-		for ( i = 0; i < prefilters.length; i++ ) {
-			prefilters[i](s);
-		}
-		
+
 		// Get internal
-		internal = selectTransport( s );
+		internal = jQuery.xhr.prefilter( s ).transport( s );
 		
 		// Re-actualize url & data
 		url = s.url;
@@ -606,100 +601,18 @@ jQuery.xhr = function( _native ) {
 	return xhr;
 };
 
-jQuery.extend(jQuery.xhr, {
-	
-	// Add new prefilter
-	prefilter: function (functor) {
-		if ( isFunction(functor) ) {
-			jQuery.ajaxSettings.prefilters.push( functor );
-		}
-		return this;
-	},
-	
-	// Bind a transport to one or more dataTypes
-	bindTransport: function () {
-		
-		var args = arguments,
-			i,
-			start = 0,
-			length = args.length,
-			dataTypes = [ "*" ],
-			functors = [],
-			functor,
-			first,
-			append,
-			list,
-			transports = jQuery.ajaxSettings.transports;
-			
-		if ( length ) {
-				
-			if ( ! isFunction( args[ 0 ] ) ) {
-				
-				dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-				start = 1;
-				
-			}
-			
-			if ( dataTypes.length && start < length ) {
-				
-				for ( i = start; i < length; i++ ) {
-					functor = args[i];
-					if ( isFunction(functor) ) {
-						functors.push( functor );
-					}
-				}
-						
-				if ( functors.length ) {
-							
-					jQuery.each ( dataTypes, function( _ , dataType ) {
-						
-						first = /^\+/.test( dataType );
-						
-						if (first) {
-							dataType = dataType.substr(1);
-						}
-						
-						if ( dataType !== "" ) {
-						
-							append = Array.prototype[ first ? "unshift" : "push" ];
-							
-							list = transports[ dataType ];
-					
-							jQuery.each ( functors, function( _ , functor ) {
-									
-								if ( ! list ) {
-									
-									list = transports[ dataType ] = [ functor ];
-									
-								} else {
-									
-									append.call( list , functor );
-								}
-							} );
-						}
-									
-					} );
-				}
-			}
-		}
-		
-		return this;
-	}
-
-	
-});
-
-// Select a transport given options
-function selectTransport( s ) {
+// Execute or select from functions in a given structure of options
+function xhr_selectOrExecute( structure , s ) {
 
 	var dataTypes = s.dataTypes,
 		transportDataType,
-		transportsList,
-		transport,
+		list,
+		selected,
 		i,
 		length,
 		checked = {},
-		flag;
+		flag,
+		noSelect = structure !== "transports";
 		
 	function initSearch( dataType ) {
 
@@ -709,9 +622,9 @@ function selectTransport( s ) {
 			
 			checked[ dataType ] = 1;
 			transportDataType = dataType;
-			transportsList = s.transports[ dataType ];
+			list = s[ structure ][ dataType ];
 			i = -1;
-			length = transportsList ? transportsList.length : 0 ;
+			length = list ? list.length : 0 ;
 		}
 
 		return flag;
@@ -719,7 +632,7 @@ function selectTransport( s ) {
 	
 	initSearch( dataTypes[ 0 ] );
 
-	for ( i = 0 ; ! transport && i <= length ; i++ ) {
+	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
 		
 		if ( i === length ) {
 			
@@ -727,21 +640,95 @@ function selectTransport( s ) {
 			
 		} else {
 
-			transport = transportsList[ i ]( s , determineDataType );
+			selected = list[ i ]( s , determineDataType );
 
 			// If we got redirected to another dataType
 			// Search there (if not in progress or already tried)
-			if ( typeof( transport ) === "string" &&
-				initSearch( transport ) ) {
+			if ( typeof( selected ) === "string" &&
+				initSearch( selected ) ) {
 
-				dataTypes.unshift( transport );
-				transport = 0;
+				dataTypes.unshift( selected );
+				selected = 0;
 			}
 		}
 	}
 
-	return transport;
+	return noSelect ? jQuery.xhr : selected;
 }
+
+// Add an element to one of the xhr structures in ajaxSettings
+function xhr_addElement( structure , args ) {
+		
+	var i,
+		j,
+		start = 0,
+		length = args.length,
+		dataTypes = [ "*" ],
+		dLength = 1,
+		dataType,
+		functors = [],
+		first,
+		append,
+		list;
+		
+	if ( length ) {
+		
+		first = jQuery.type( args[ 0 ] );
+		
+		if ( first === "object" ) {
+			return xhr_selectOrExecute( structure , args[ 0 ] );
+		}
+		
+		structure = jQuery.ajaxSettings[ structure ];
+		
+		if ( first !== "function" ) {
+			
+			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
+			dLength = dataTypes.length;
+			start = 1;
+			
+		}
+		
+		if ( dLength && start < length ) {
+			
+			functors = sliceFunc.call( args , start );
+			
+			length -= start;
+					
+			for( i = 0 ; i < dLength ; i++ ) {
+				
+				dataType = dataTypes[ i ];
+				
+				first = /^\+/.test( dataType );
+				
+				if (first) {
+					dataType = dataType.substr(1);
+				}
+				
+				if ( dataType !== "" ) {
+				
+					append = Array.prototype[ first ? "unshift" : "push" ];
+					
+					list = structure[ dataType ] = structure[ dataType ] || [];
+			
+					for ( j = 0; j < length; j++ ) {
+						append.call( list , functors[ j ] );
+					}
+				}
+			}
+		}
+	}
+	
+	return jQuery.xhr;
+}
+
+// Install prefilter & transport methods
+jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
+	_ = name + "s";
+	jQuery.xhr[ name ] = function() {
+		return xhr_addElement( _ , arguments );
+	};
+} );
 	
 // Utility function that handles dataType when response is received
 // (for those transports that can give text or xml responses)

From 38101be0484d79cb2d849ea252f508fe50bf72a3 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 16:58:52 +0100
Subject: [PATCH 019/110] Rewrote the data conversion logic in ajax. Should be
 cleaner and faster.

---
 src/ajax.js |  29 ++++------
 src/xhr.js  | 163 ++++++++++++++++++++--------------------------------
 2 files changed, 75 insertions(+), 117 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 258694c81..25ac8cf0c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -181,12 +181,7 @@ jQuery.extend({
 		xhr: function() {
 			return new window.XMLHttpRequest();
 		},
-		xhrResponseFields: {
-			xml: "XML",
-			text: "Text",
-			json: "JSON"
-		},
-			
+
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -194,13 +189,13 @@ jQuery.extend({
 			json: "application/json, text/javascript",
 			"*": "*/*"
 		},
-		
+
 		autoDataType: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
 		},
-		
+
 		// Prefilters
 		// 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
 		// 2) These are called:
@@ -210,26 +205,26 @@ jQuery.extend({
 		// 4) the catchall symbol "*" can be used
 		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
 		prefilters: {},
-		
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
-		
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
 		// 3) error throws is used as error data
 		dataCheckers: {
-	
+
 			// Check if data is a string
 			"text": function(data) {
 				if ( typeof data != "string" ) {
 					jQuery.error("typeerror");
 				}
 			},
-	
+
 			// Check if xml has been properly parsed
 			"xml": function(data) {
 				var documentElement = data ? data.documentElement : data;
@@ -241,25 +236,25 @@ jQuery.extend({
 				}
 			}
 		},
-		
+
 		// List of data converters
 		// 1) key format is "source_type => destination_type" (spaces required)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
-		
+
 			// Convert anything to text
 			"* => text": function(data) {
 				return "" + data;
 			},
-			
+
 			// Text to html (no transformation)
 			"text => html": function(data) {
 				return data;
 			},
-			
+
 			// Evaluate text as a json expression
 			"text => json": jQuery.parseJSON,
-			
+
 			// Parse text as xml
 			"text => xml": function(data) {
 				var xml, parser;
diff --git a/src/xhr.js b/src/xhr.js
index 208a734b4..1993e0b5d 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -7,9 +7,7 @@ var rquery_xhr = /\?/,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 	
-	sliceFunc = Array.prototype.slice,
-	
-	isFunction = jQuery.isFunction;
+	sliceFunc = Array.prototype.slice;
 	
 // Creates a jQuery xhr object
 jQuery.xhr = function( _native ) {
@@ -147,7 +145,7 @@ jQuery.xhr = function( _native ) {
 				requestHeaders[ i.toLowerCase() ] = headers[ i ];
 			}			
 		}
-			
+		
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
 		
@@ -224,111 +222,76 @@ jQuery.xhr = function( _native ) {
 				// (if an exception is thrown in the process, it'll be notified as an error)
 				try {
 					
-					function checkData(data) {
-						if ( data !== undefined ) {
-							var testFunction = s.dataCheckers[srcDataType];
-							if ( isFunction( testFunction ) ) {
-								testFunction(data);
-							}
-						}
-					}
-					
-					function convertData (data) {
-						var conversionFunction = dataConverters[srcDataType+" => "+destDataType] ||
-								dataConverters["* => "+destDataType],
-							noFunction = ! isFunction( conversionFunction );
-						if ( noFunction ) {
-							if ( srcDataType != "text" && destDataType != "text" ) {
-								// We try to put text inbetween
-								var first = dataConverters[srcDataType+" => text"] ||
-										dataConverters["* => text"],
-									second = dataConverters["text => "+destDataType] ||
-										dataConverters["* => "+destDataType],
-									areFunctions = isFunction( first ) && isFunction( second );
-								if ( areFunctions ) {
-									conversionFunction = function (data) {
-										return second( first ( data ) );
-									};
-								}
-								noFunction = ! areFunctions;
-							}
-							if ( noFunction ) {
-								jQuery.error( "no data converter between " + srcDataType + " and " + destDataType );
-							}
-							
-						}
-						return conversionFunction(data);
-					}
-					
-					var dataTypes = s.dataTypes,
-						i,
-						length,
-						data = response,
+					var i,
+						current,
+						prev,
+						checker,
+						conv1,
+						conv2,
+						oneConv,
+						convertion,
+						dataTypes = s.dataTypes,
+						dataCheckers = s.dataCheckers,
 						dataConverters = s.dataConverters,
-						srcDataType,
-						destDataType,
-						responseTypes = s.xhrResponseFields;
+						dataFilter = s.dataFilter,
+						responses = {
+							"xml": "XML",
+							"text": "Text"
+						};
+					
+					for( i = 0 ; i < dataTypes.length ; i++ ) {
 						
-					for ( i = 0, length = dataTypes.length ; i < length ; i++ ) {
-	
-						destDataType = dataTypes[i];
+						current = dataTypes[ i ];
 						
-						if ( !srcDataType ) { // First time
+						if ( i ) {
 							
-							// Copy type
-							srcDataType = destDataType;
-							// Check
-							checkData(data);
-							// Apply dataFilter
-							if ( isFunction( s.dataFilter ) ) {
-								data = s.dataFilter(data, s.dataType);
-								// Recheck data
-								checkData(data);
+							prev = dataTypes[ i - 1 ];
+							
+							if ( prev === "*" ) {
+								
+								prev = current;
+								
+							} else if ( current !== "*" && prev !== current ) {
+							
+								oneConv = conv1 = 
+									dataConverters[ ( conversion = prev + " => " + current ) ] ||
+									dataConverters[ "* => " + current ];
+								
+								if ( ! oneConv && prev !== "text" && current !== "text" ) {
+									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
+									conv2 = dataConverters[ "text => " + current ];
+								}
+								if ( oneConv || conv1 && conv2 ) {
+									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+								} else {
+									throw "no " + conversion;
+								}
 							}
-							
-						} else { // Subsequent times
-							
-							// handle auto
-							// JULIAN: for reasons unknown to me === doesn't work here
-							if (destDataType == "*") {
-	
-								destDataType = srcDataType;
-								
-							} else if ( srcDataType != destDataType ) {
-								
-								// Convert
-								data = convertData(data);
-								// Copy type & check
-								srcDataType = destDataType;
-								checkData(data);
-								
-							}
-							
-						}
-	
-						// Copy response into the xhr if it hasn't been already
-						var responseDataType,
-							responseType = responseTypes[srcDataType];
-						
-						if ( responseType ) {
-							
-							responseDataType = srcDataType;
-							
-						} else {
-							
-							responseType = responseTypes[ responseDataType = "text" ];
-							
-						}
-							
-						if ( responseType !== 1 ) {
-							xhr[ "response" + responseType ] = data;
-							responseTypes[ responseType ] = 1;
 						}
 						
+						checker = dataCheckers[ current ];
+						
+						if ( response != null && checker ) {
+							checker( response );
+						}
+						
+						if ( responses[ current ] ) {
+							xhr[ "response" + responses[ current ] ] = response;
+							responses[ current ] = 0;
+						}
+						
+						if ( ! i && dataFilter ) {
+							
+							response = dataFilter( response );
+							
+							dataTypes = s.dataTypes;
+							dataFilter = 0;
+							i--;
+						}
 					}
 	
 					// We have a real success
-					success = data;
+					success = response;
 					isSuccess = 1;
 					
 				} catch(e) {
@@ -406,7 +369,7 @@ jQuery.xhr = function( _native ) {
 	// Ready state change
 	function setState( value ) {
 		xhr.readyState = value;
-		if ( isFunction( xhr.onreadystatechange ) ) {
+		if ( jQuery.isFunction( xhr.onreadystatechange ) ) {
 			xhr.onreadystatechange();
 		}
 	}

From 76102f4d8b56d88f8e37bec65d552d132703198d Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 17:04:07 +0100
Subject: [PATCH 020/110] Removed NFE to make old Safari happy and avoid leaks
 in IE (as per David Murdoch's warning).

---
 src/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index 39d49743c..4c717e3b9 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function then() {
+				then: function () {
 					
 					if ( ! cancelled ) {
 					
@@ -820,7 +820,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								then.apply( this , elem );
+								deferred.then.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}

From 11642ba20c10ced6363d81d6e3a0239ac10dab27 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:02:00 +0100
Subject: [PATCH 021/110] jQuery.parseXML extracted from ajax & added to core,
 needs unit testing.

---
 src/core.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/core.js b/src/core.js
index 4c717e3b9..8853e81cc 100644
--- a/src/core.js
+++ b/src/core.js
@@ -546,6 +546,28 @@ jQuery.extend({
 			jQuery.error( "Invalid JSON: " + data );
 		}
 	},
+	
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+		
+		tmp = xml.documentElement;
+		
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		
+		return xml;
+	},
 
 	noop: function() {},
 

From d303687815581987f75f2e40e833022fc25c8741 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:02:45 +0100
Subject: [PATCH 022/110] Changed dataConverters key format.

---
 src/ajax.js              | 25 +++++--------------------
 src/transports/jsonp.js  |  6 ++----
 src/transports/script.js |  2 +-
 src/xhr.js               | 10 ++++++----
 test/unit/ajax.js        |  6 +++++-
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 25ac8cf0c..592c25cfb 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -238,36 +238,21 @@ jQuery.extend({
 		},
 
 		// List of data converters
-		// 1) key format is "source_type => destination_type" (spaces required)
+		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
 
 			// Convert anything to text
-			"* => text": function(data) {
-				return "" + data;
-			},
+			"* text": window.String,
 
 			// Text to html (no transformation)
-			"text => html": function(data) {
-				return data;
-			},
+			"text html": window.String,
 
 			// Evaluate text as a json expression
-			"text => json": jQuery.parseJSON,
+			"text json": jQuery.parseJSON,
 
 			// Parse text as xml
-			"text => xml": function(data) {
-				var xml, parser;
-				if ( window.DOMParser ) { // Standard
-					parser = new DOMParser();
-					xml = parser.parseFromString(data,"text/xml");
-				} else { // IE
-					xml = new ActiveXObject("Microsoft.XMLDOM");
-					xml.async="false";
-					xml.loadXML(data);
-				}
-				return xml;
-			}
+			"text xml": jQuery.parseXML
 		}
 	},
 
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index 6c9fb704e..a685bb196 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -70,18 +70,16 @@ jQuery.xhr.prefilter("json jsonp", function(s) {
 		}, s.complete ];
 				
 		// Use data converter to retrieve json after script execution
-		s.dataConverters["script => json"] = function() {
+		s.dataConverters["script json"] = function() {
 			if ( ! responseContainer ) {
-				jQuery.error("Callback '" + jsonpCallback + "' was not called");
+				jQuery.error( jsonpCallback + " was not called" );
 			}
 			return responseContainer[ 0 ];
 		};
 		
 		// Delegate to script transport
 		return "script";
-		
 	}
-
 });
 
 })( jQuery );
diff --git a/src/transports/script.js b/src/transports/script.js
index ebc2302b4..374893c04 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -12,7 +12,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 	},
 		
 	dataConverters: {
-		"text => script": jQuery.globalEval
+		"text script": jQuery.globalEval
 	}
 } );
 
diff --git a/src/xhr.js b/src/xhr.js
index 1993e0b5d..f8d15c7d1 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -254,12 +254,14 @@ jQuery.xhr = function( _native ) {
 							} else if ( current !== "*" && prev !== current ) {
 							
 								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " => " + current ) ] ||
-									dataConverters[ "* => " + current ];
+									dataConverters[ ( conversion = prev + " " + current ) ] ||
+									dataConverters[ "* " + current ];
+								
+								console.log( conversion );
 								
 								if ( ! oneConv && prev !== "text" && current !== "text" ) {
-									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
-									conv2 = dataConverters[ "text => " + current ];
+									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+									conv2 = dataConverters[ "text " + current ];
 								}
 								if ( oneConv || conv1 && conv2 ) {
 									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 35c030247..222dd9a38 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -707,6 +707,10 @@ test("jQuery.ajax - xml: non-namespace elements inside namespaced elements (over
 		equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
 		equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
 		start();
+	  },
+	  error: function(_1,_2,error) {
+		ok( false, error );
+		start();
 	  }
 	});
 });
@@ -1487,7 +1491,7 @@ test("jQuery.ajax() - json by content-type disabled with options", function() {
 		},
 		success: function( text ) {
 			equals( typeof text , "string" , "json wasn't auto-determined" );
-			var json = this.dataConverters["text => json"]( text );
+			var json = this.dataConverters["text json"]( text );
 	  		ok( json.length >= 2, "Check length");
 	  		equals( json[0].name, 'John', 'Check JSON: first, name' );
 	  		equals( json[0].age, 21, 'Check JSON: first, age' );

From 1e1a9c7eb055511dce74e4b5f807b93d5a76bbd6 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:53:55 +0100
Subject: [PATCH 023/110] Capitalized Deferred & _Deferred to clearly mark them
 as new types, like Event.

---
 src/core.js       | 12 ++++++------
 src/xhr.js        |  4 ++--
 test/unit/core.js | 40 ++++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/core.js b/src/core.js
index 8853e81cc..77d35bdd9 100644
--- a/src/core.js
+++ b/src/core.js
@@ -805,7 +805,7 @@ jQuery.extend({
 	},
 	
 	// Create a simple deferred (one callbacks list)
-	_deferred: function( cancellable ) {
+	_Deferred: function( cancellable ) {
 		
 		// cancellable by default
 		cancellable = cancellable !== false;
@@ -901,7 +901,7 @@ jQuery.extend({
 	
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
-	deferred: function( func , cancellable ) {
+	Deferred: function( func , cancellable ) {
 		
 		// Handle varargs
 		if ( arguments.length === 1 ) {
@@ -912,8 +912,8 @@ jQuery.extend({
 			}
 		}
 		
-		var errorDeferred = jQuery._deferred( cancellable ),
-			deferred = jQuery._deferred( cancellable ),
+		var errorDeferred = jQuery._Deferred( cancellable ),
+			deferred = jQuery._Deferred( cancellable ),
 			// Keep reference of the cancel method since we'll redefine it
 			cancelThen = deferred.cancel;
 			
@@ -953,7 +953,7 @@ jQuery.extend({
 		method = method || "then";
 		object = jQuery.isDeferred( object , method ) ?
 			object :
-			jQuery.deferred().resolve( object );
+			jQuery.Deferred().resolve( object );
 		object.fail = object.fail || function() { return this; };
 		object[ method ] = object[ method ] || object.then;
 		object.then = object.then || object[ method ];
@@ -979,7 +979,7 @@ jQuery.extend({
 
 // Create readyList deferred
 // also force $.fn.ready to be recognized as a defer
-readyList = jQuery._deferred( false );
+readyList = jQuery._Deferred( false );
 jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
diff --git a/src/xhr.js b/src/xhr.js
index f8d15c7d1..45e9aa725 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
 		if ( force || internal ) {
 			
 			// Reset callbacks lists
-			deferred = jQuery.deferred();
-			completeDeferred = jQuery._deferred();
+			deferred = jQuery.Deferred();
+			completeDeferred = jQuery._Deferred();
 			
 			xhr.success = xhr.then = deferred.then;
 			xhr.error = xhr.fail = deferred.fail;
diff --git a/test/unit/core.js b/test/unit/core.js
index f4117247a..619ad92bd 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -903,7 +903,7 @@ test("jQuery.parseJSON", function(){
 	}
 });
 
-test("jQuery._deferred()", function() {
+test("jQuery._Deferred()", function() {
 	
 	expect( 14 );
 	
@@ -911,7 +911,7 @@ test("jQuery._deferred()", function() {
 		object,
 		test;
 	
-	deferred = jQuery._deferred();
+	deferred = jQuery._Deferred();
 		
 	test = false;
 		
@@ -944,7 +944,7 @@ test("jQuery._deferred()", function() {
 	
 	ok( test , "Test manual cancel" );
 	
-	deferred = jQuery._deferred().then( function() {
+	deferred = jQuery._Deferred().then( function() {
 		return false;
 	} );
 	
@@ -959,7 +959,7 @@ test("jQuery._deferred()", function() {
 	ok( test , "Test cancel by returning false" );
 
 	try {
-		deferred = jQuery._deferred().resolve().then( function() {
+		deferred = jQuery._Deferred().resolve().then( function() {
 			throw "Error";
 		} , function() {
 			ok( false , "Test deferred cancel on exception" );
@@ -970,7 +970,7 @@ test("jQuery._deferred()", function() {
 	}
 	
 	test = "";
-	deferred = jQuery._deferred().then( function() {
+	deferred = jQuery._Deferred().then( function() {
 		
 		test += "A";
 		
@@ -1001,7 +1001,7 @@ test("jQuery._deferred()", function() {
 	
 	strictEqual( test , "ABC" , "Test then callbacks order" );
 	
-	deferred = jQuery._deferred( false ).resolve().cancel();
+	deferred = jQuery._Deferred( false ).resolve().cancel();
 	
 	deferred.then( function() {
 		ok( true , "Test non-cancellable deferred not cancelled manually");
@@ -1023,31 +1023,31 @@ test("jQuery._deferred()", function() {
 		deferred.then();
 	}
 	
-	deferred = jQuery._deferred();
+	deferred = jQuery._Deferred();
 	
 	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });
 
-test("jQuery.deferred()", function() {
+test("jQuery.Deferred()", function() {
 	
 	expect( 8 );
 	
-	jQuery.deferred( function( defer ) {
+	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
 		this.resolve( "done" );
 	}).then( function( value ) {
 		strictEqual( value , "done" , "Passed function executed" );
 	});
 	
-	jQuery.deferred().resolve().then( function() {
+	jQuery.Deferred().resolve().then( function() {
 		ok( true , "Success on resolve" );
 	}).fail( function() {
 		ok( false , "Error on resolve" );
 	});
 	
-	jQuery.deferred().reject().then( function() {
+	jQuery.Deferred().reject().then( function() {
 		ok( false , "Success on reject" );
 	}).fail( function() {
 		ok( true , "Error on reject" );
@@ -1055,7 +1055,7 @@ test("jQuery.deferred()", function() {
 	
 	var flag = true;
 	
-	jQuery.deferred().resolve().cancel().then( function() {
+	jQuery.Deferred().resolve().cancel().then( function() {
 		ok( flag = false , "Success on resolve/cancel" );
 	}).fail( function() {
 		ok( flag = false , "Error on resolve/cancel" );
@@ -1065,7 +1065,7 @@ test("jQuery.deferred()", function() {
 	
 	flag = true;
 	
-	jQuery.deferred().reject().cancel().then( function() {
+	jQuery.Deferred().reject().cancel().then( function() {
 		ok( flag = false , "Success on reject/cancel" );
 	}).fail( function() {
 		ok( flag = false , "Error on reject/cancel" );
@@ -1073,13 +1073,13 @@ test("jQuery.deferred()", function() {
 	
 	ok( flag , "Cancel on reject" );
 	
-	jQuery.deferred( false ).resolve().then( function() {
+	jQuery.Deferred( false ).resolve().then( function() {
 		return false;
 	} , function() {
 		ok( true , "Not cancelled on resolve" );
 	});
 	
-	jQuery.deferred( false ).reject().fail( function() {
+	jQuery.Deferred( false ).reject().fail( function() {
 		return false;
 	} , function() {
 		ok( true , "Not cancelled on reject" );
@@ -1097,8 +1097,8 @@ test("jQuery.isDeferred()", function() {
 	object2.then._ = [];
 	
 	// The use case that we want to match
-	ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
-	ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
+	ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
+	ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");
 	
 	// Some other objects
 	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
@@ -1111,7 +1111,7 @@ test("jQuery.isDeferred()", function() {
 	ok(!jQuery.isDeferred(null), "null");
 	ok(!jQuery.isDeferred(undefined), "undefined");
 	
-	object1 = {custom: jQuery._deferred().then};
+	object1 = {custom: jQuery._Deferred().then};
 	
 	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
 	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
@@ -1121,10 +1121,10 @@ test("jQuery.when()", function() {
 	
 	expect( 5 );
 	
-	var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
+	var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
 	
 	for( i = 1 ; i < 3 ; i++ ) {
-		jQuery.when( cache || jQuery.deferred( function() {
+		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );
 		}) ).then( function( value ) {
 			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );

From e3f3f1892747004f86111fe17a8ed2e50c5d989e Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 01:27:40 +0100
Subject: [PATCH 024/110] Removed a console.log :/

---
 src/xhr.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/xhr.js b/src/xhr.js
index 45e9aa725..8c26bc8c1 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -257,8 +257,6 @@ jQuery.xhr = function( _native ) {
 									dataConverters[ ( conversion = prev + " " + current ) ] ||
 									dataConverters[ "* " + current ];
 								
-								console.log( conversion );
-								
 								if ( ! oneConv && prev !== "text" && current !== "text" ) {
 									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
 									conv2 = dataConverters[ "text " + current ];

From 846c52d1f8535a6283dcc42c6e8f0c26991936ad Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 01:29:04 +0100
Subject: [PATCH 025/110] Deferred cannot be cancelled by returning false in a
 callback. Exception in the callback are still propagated and execution of
 remaining callbacks is still possible.

---
 src/core.js       | 79 +++++++++++++++++++++------------------------
 test/unit/core.js | 81 ++++-------------------------------------------
 2 files changed, 43 insertions(+), 117 deletions(-)

diff --git a/src/core.js b/src/core.js
index 77d35bdd9..57a42d09e 100644
--- a/src/core.js
+++ b/src/core.js
@@ -805,10 +805,7 @@ jQuery.extend({
 	},
 	
 	// Create a simple deferred (one callbacks list)
-	_Deferred: function( cancellable ) {
-		
-		// cancellable by default
-		cancellable = cancellable !== false;
+	_Deferred: function() {
 		
 		var // callbacks list
 			callbacks = [],
@@ -825,7 +822,7 @@ jQuery.extend({
 				then: function () {
 					
 					if ( ! cancelled ) {
-					
+						
 						var args = arguments,
 							i,
 							length,
@@ -852,24 +849,23 @@ jQuery.extend({
 							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
 						}
 					}
+					
 					return this;
 				},
 				
 				// resolve with given context and args
-				// (i is used internally)
-				fire: function( context , args , i ) {
+				fire: function( context , args ) {
 					if ( ! cancelled && ! fired && ! firing ) {
+						
 						firing = 1;
+						
 						try {
-							for( i = 0 ; ! cancelled && callbacks[ i ] ; i++ ) {
-								cancelled = ( callbacks[ i ].apply( context , args ) === false ) && cancellable;
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context , args );
 							}
-						} catch( e ) {
-							cancelled = cancellable;
-							jQuery.error( e );
-						} finally {
+						}
+						finally {
 							fired = [ context , args ];
-							callbacks = cancelled ? [] : callbacks.slice( i + 1 );
 							firing = 0;
 						}
 					}
@@ -882,15 +878,22 @@ jQuery.extend({
 					return this;
 				},
 				
-				// cancelling further callbacks
-				cancel: function() {
-					if ( cancellable ) {
-						callbacks = [];
-						cancelled = 1;
-					}
-					return this;
-				}
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
 				
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				},
+				
+				// Has this deferred been cancelled?
+				isCancelled: function() {
+					return !!cancelled;
+				}
 			};
 		
 		// Add the deferred marker
@@ -901,21 +904,11 @@ jQuery.extend({
 	
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
-	Deferred: function( func , cancellable ) {
+	Deferred: function( func ) {
 		
-		// Handle varargs
-		if ( arguments.length === 1 ) {
-			
-			if ( typeof func === "boolean" ) {
-				cancellable = func;
-				func = 0;
-			}
-		}
-		
-		var errorDeferred = jQuery._Deferred( cancellable ),
-			deferred = jQuery._Deferred( cancellable ),
-			// Keep reference of the cancel method since we'll redefine it
-			cancelThen = deferred.cancel;
+		var errorDeferred = jQuery._Deferred(),
+			deferred = jQuery._Deferred(),
+			successCancel = deferred.cancel;
 			
 		// Add errorDeferred methods and redefine cancel			
 		jQuery.extend( deferred , {
@@ -923,16 +916,16 @@ jQuery.extend({
 				fail: errorDeferred.then,
 				fireReject: errorDeferred.fire,
 				reject: errorDeferred.resolve,
-				cancel: function() {
-					cancelThen();
-					errorDeferred.cancel();
-					return this;
-				}
+				isRejected: errorDeferred.isResolved
 
 		} );
 		
+		// Remove cancel related
+		delete deferred.cancel;
+		delete deferred.isCancelled;
+		
 		// Make sure only one callback list will be used
-		deferred.then( errorDeferred.cancel ).fail( cancelThen );
+		deferred.then( errorDeferred.cancel ).fail( successCancel );
 		
 		// Call given func if any
 		if ( func ) {
@@ -979,7 +972,7 @@ jQuery.extend({
 
 // Create readyList deferred
 // also force $.fn.ready to be recognized as a defer
-readyList = jQuery._Deferred( false );
+readyList = jQuery._Deferred();
 jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
diff --git a/test/unit/core.js b/test/unit/core.js
index 619ad92bd..8af59ffbf 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -905,7 +905,7 @@ test("jQuery.parseJSON", function(){
 
 test("jQuery._Deferred()", function() {
 	
-	expect( 14 );
+	expect( 10 );
 	
 	var deferred,
 		object,
@@ -938,31 +938,19 @@ test("jQuery._Deferred()", function() {
 	test = true;
 	
 	deferred.then( function() {
-		ok( false , "Manual cancel was ignored" );
+		ok( false , "Cancel was ignored" );
 		test = false;
 	} );
 	
-	ok( test , "Test manual cancel" );
+	ok( test , "Test cancel" );
 	
-	deferred = jQuery._Deferred().then( function() {
-		return false;
-	} );
+	deferred = jQuery._Deferred().resolve();
 	
-	deferred.resolve();
-	
-	test = true;
-	
-	deferred.then( function() {
-		test = false;
-	} );
-	
-	ok( test , "Test cancel by returning false" );
-
 	try {
-		deferred = jQuery._Deferred().resolve().then( function() {
+		deferred.then( function() {
 			throw "Error";
 		} , function() {
-			ok( false , "Test deferred cancel on exception" );
+			ok( true , "Test deferred do not cancel on exception" );
 		} );
 	} catch( e ) {
 		strictEqual( e , "Error" , "Test deferred propagates exceptions");
@@ -1001,28 +989,6 @@ test("jQuery._Deferred()", function() {
 	
 	strictEqual( test , "ABC" , "Test then callbacks order" );
 	
-	deferred = jQuery._Deferred( false ).resolve().cancel();
-	
-	deferred.then( function() {
-		ok( true , "Test non-cancellable deferred not cancelled manually");
-		return false;
-	} );
-
-	deferred.then( function() {
-		ok( true , "Test non-cancellable deferred not cancelled by returning false");
-	} );
-	
-	try {
-		deferred.then( function() {
-			throw "Error";
-		} , function() {
-			ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
-		} );
-	} catch( e ) {
-		strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
-		deferred.then();
-	}
-	
 	deferred = jQuery._Deferred();
 	
 	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
@@ -1032,7 +998,7 @@ test("jQuery._Deferred()", function() {
 
 test("jQuery.Deferred()", function() {
 	
-	expect( 8 );
+	expect( 4 );
 	
 	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
@@ -1052,39 +1018,6 @@ test("jQuery.Deferred()", function() {
 	}).fail( function() {
 		ok( true , "Error on reject" );
 	});
-	
-	var flag = true;
-	
-	jQuery.Deferred().resolve().cancel().then( function() {
-		ok( flag = false , "Success on resolve/cancel" );
-	}).fail( function() {
-		ok( flag = false , "Error on resolve/cancel" );
-	});
-	
-	ok( flag , "Cancel on resolve" );
-	
-	flag = true;
-	
-	jQuery.Deferred().reject().cancel().then( function() {
-		ok( flag = false , "Success on reject/cancel" );
-	}).fail( function() {
-		ok( flag = false , "Error on reject/cancel" );
-	});
-	
-	ok( flag , "Cancel on reject" );
-	
-	jQuery.Deferred( false ).resolve().then( function() {
-		return false;
-	} , function() {
-		ok( true , "Not cancelled on resolve" );
-	});
-	
-	jQuery.Deferred( false ).reject().fail( function() {
-		return false;
-	} , function() {
-		ok( true , "Not cancelled on reject" );
-	});
-	
 });
 	
 test("jQuery.isDeferred()", function() {

From 5237b09602d5e360da361823748b0f34861b5a9a Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 12:52:53 +0100
Subject: [PATCH 026/110] Removed custom method in isDeferred and when.

---
 src/core.js       | 13 ++++---------
 test/unit/core.js | 25 +++----------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/core.js b/src/core.js
index 57a42d09e..3763cd0fe 100644
--- a/src/core.js
+++ b/src/core.js
@@ -936,20 +936,15 @@ jQuery.extend({
 	},
 
 	// Check if an object is a deferred
-	isDeferred: function( object , method ) {
-		method = method || "then";
-		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	isDeferred: function( object ) {
+		return !!( object && object.then && object.then._ === deferredMarker );
 	},
 	
 	// Deferred helper
-	when: function( object , method ) {
-		method = method || "then";
-		object = jQuery.isDeferred( object , method ) ?
+	when: function( object ) {
+		object = jQuery.isDeferred( object ) ?
 			object :
 			jQuery.Deferred().resolve( object );
-		object.fail = object.fail || function() { return this; };
-		object[ method ] = object[ method ] || object.then;
-		object.then = object.then || object[ method ];
 		return object;
 	},
 
diff --git a/test/unit/core.js b/test/unit/core.js
index 8af59ffbf..eb88c4a89 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1022,7 +1022,7 @@ test("jQuery.Deferred()", function() {
 	
 test("jQuery.isDeferred()", function() {
 	
-	expect( 11 );
+	expect( 10 );
 	
 	var object1 = { then: function() { return this; } },
 		object2 = { then: function() { return this; } };
@@ -1047,14 +1047,13 @@ test("jQuery.isDeferred()", function() {
 	object1 = {custom: jQuery._Deferred().then};
 	
 	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
-	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
 });
 
 test("jQuery.when()", function() {
 	
-	expect( 5 );
+	expect( 2 );
 	
-	var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
+	var cache, i;
 	
 	for( i = 1 ; i < 3 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
@@ -1066,22 +1065,4 @@ test("jQuery.when()", function() {
 			ok( false , "Fail called" );
 		});
 	}
-	
-	cache = 0;
-
-	for( i = 1 ; i < 3 ; i++ ) {
-		jQuery.when( cache || deferred , "done" ).done( function( value ) {
-			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
-			cache = value;
-		}).fail( function() {
-			ok( false , "Custom method: fail called" );
-		});
-	}
-	
-	stop();
-	
-	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
-		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
-		start();
-	});
 });

From 00fb8a9ad61eb6d13e6f6c7c668caa66074f05d1 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 15:38:33 +0100
Subject: [PATCH 027/110] Removed dataCheckers, added true as possible value
 for dataConverters indicating dataType equivalence (ie. no conversion has to
 be performed).

---
 src/ajax.js | 29 ++-----------------------
 src/xhr.js  | 62 +++++++++++++++++++++--------------------------------
 2 files changed, 27 insertions(+), 64 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 592c25cfb..5c655b58c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -212,31 +212,6 @@ jQuery.extend({
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
 
-		// Checkers
-		// 1) key is dataType
-		// 2) they are called to control successful response
-		// 3) error throws is used as error data
-		dataCheckers: {
-
-			// Check if data is a string
-			"text": function(data) {
-				if ( typeof data != "string" ) {
-					jQuery.error("typeerror");
-				}
-			},
-
-			// Check if xml has been properly parsed
-			"xml": function(data) {
-				var documentElement = data ? data.documentElement : data;
-				if ( ! documentElement || ! documentElement.nodeName ) {
-					jQuery.error("typeerror");
-				}
-				if ( documentElement.nodeName == "parsererror" ) {
-					jQuery.error("parsererror");
-				}
-			}
-		},
-
 		// List of data converters
 		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
@@ -245,8 +220,8 @@ jQuery.extend({
 			// Convert anything to text
 			"* text": window.String,
 
-			// Text to html (no transformation)
-			"text html": window.String,
+			// Text to html (true = no transformation)
+			"text html": true,
 
 			// Evaluate text as a json expression
 			"text json": jQuery.parseJSON,
diff --git a/src/xhr.js b/src/xhr.js
index 8c26bc8c1..0ff7665b2 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -231,7 +231,6 @@ jQuery.xhr = function( _native ) {
 						oneConv,
 						convertion,
 						dataTypes = s.dataTypes,
-						dataCheckers = s.dataCheckers,
 						dataConverters = s.dataConverters,
 						dataFilter = s.dataFilter,
 						responses = {
@@ -243,51 +242,40 @@ jQuery.xhr = function( _native ) {
 						
 						current = dataTypes[ i ];
 						
-						if ( i ) {
-							
-							prev = dataTypes[ i - 1 ];
-							
-							if ( prev === "*" ) {
-								
-								prev = current;
-								
-							} else if ( current !== "*" && prev !== current ) {
-							
-								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " " + current ) ] ||
-									dataConverters[ "* " + current ];
-								
-								if ( ! oneConv && prev !== "text" && current !== "text" ) {
-									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-									conv2 = dataConverters[ "text " + current ];
-								}
-								if ( oneConv || conv1 && conv2 ) {
-									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-								} else {
-									throw "no " + conversion;
-								}
-							}
-						}
-						
-						checker = dataCheckers[ current ];
-						
-						if ( response != null && checker ) {
-							checker( response );
-						}
-						
 						if ( responses[ current ] ) {
 							xhr[ "response" + responses[ current ] ] = response;
 							responses[ current ] = 0;
 						}
 						
-						if ( ! i && dataFilter ) {
+						if ( i ) {
 							
-							response = dataFilter( response );
+							if ( prev !== "*" && current !== "*" && prev !== current ) {
 							
+								oneConv = conv1 = 
+									dataConverters[ ( conversion = prev + " " + current ) ] ||
+									dataConverters[ "* " + current ];
+								
+								if ( oneConv !== true ) {
+									
+									if ( ! oneConv && prev !== "text" && current !== "text" ) {
+										conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+										conv2 = dataConverters[ "text " + current ];
+									}
+									
+									if ( oneConv || conv1 && conv2 ) {
+										response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+									} else {
+										throw "no " + conversion;
+									}
+								}
+							}
+						} else if ( dataFilter ) {
+							
+							response = s.dataFilter( response );
 							dataTypes = s.dataTypes;
-							dataFilter = 0;
-							i--;
 						}
+						
+						prev = current;
 					}
 	
 					// We have a real success

From f7ed2aca562620f9424b1667170352e798e99ef3 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 18:54:37 +0100
Subject: [PATCH 028/110] Removed re-usability from jXHR object (no more open,
 send & onreadystatechange support). Streamlined the implementation and put it
 back into ajax.js (removed xhr.js in the process). Went back to a more simple
 & direct approach to options handling (keeping much room to further
 minification-related optimizations). Code is cleaner, smaller & faster.
 Removed & edited unit tests accordingly. All build files have had xhr.js
 removed.

---
 Makefile                 |   1 -
 Rakefile                 |   2 +-
 build.xml                |   1 -
 src/ajax.js              | 582 ++++++++++++++++++++++++++++++-
 src/transports/jsonp.js  |   2 +-
 src/transports/script.js |   2 +-
 src/transports/xhr.js    |   2 +-
 src/xhr.js               | 728 ---------------------------------------
 test/index.html          |   1 -
 test/unit/ajax.js        | 164 +--------
 10 files changed, 581 insertions(+), 904 deletions(-)
 delete mode 100644 src/xhr.js

diff --git a/Makefile b/Makefile
index 935f69c12..f69aa6379 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.js\
-	${SRC_DIR}/xhr.js\
 	${SRC_DIR}/transports/jsonp.js\
 	${SRC_DIR}/transports/script.js\
 	${SRC_DIR}/transports/xhr.js\
diff --git a/Rakefile b/Rakefile
index 5ea143b66..4d72a1c81 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ test_dir  = File.join( prefix, 'test' )
 # setting DIST_DIR before calling rake
 dist_dir  = ENV['DIST_DIR'] || File.join( prefix, 'dist' )
 
-base_files = %w{intro core support data queue attributes event selector traversing manipulation css ajax xhr transports/jsonp transports/script transports/xhr effects offset dimensions outro}.map { |js| File.join( src_dir, "#{js}.js" ) }
+base_files = %w{intro core support data queue attributes event selector traversing manipulation css ajax transports/jsonp transports/script transports/xhr effects offset dimensions outro}.map { |js| File.join( src_dir, "#{js}.js" ) }
 
 # Sizzle, QUnit and jQuery files/dirs
 sizzle_dir = File.join( src_dir, "sizzle" )
diff --git a/build.xml b/build.xml
index f6650f440..f2f805f41 100644
--- a/build.xml
+++ b/build.xml
@@ -63,7 +63,6 @@
 			<fileset file="src/manipulation.js" />
 			<fileset file="src/css.js" />
 			<fileset file="src/ajax.js" />
-			<fileset file="src/xhr.js" />
 			<fileset file="src/transports/jsonp.js" />
 			<fileset file="src/transports/script.js" />
 			<fileset file="src/transports/xhr.js" />
diff --git a/src/ajax.js b/src/ajax.js
index 5c655b58c..9f8e2384e 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,12 +1,20 @@
 (function( jQuery ) {
 	
-var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+var r20 = /%20/g,
 	rbracket = /\[\]$/,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	rnoContent = /^(?:GET|HEAD)$/,
 	rquery = /\?/,
-	r20 = /%20/g,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 
+	// Slice function
+	sliceFunc = Array.prototype.slice,
+	
 	// Keep a copy of the old load method
 	_load = jQuery.fn.load;
 
@@ -232,15 +240,407 @@ jQuery.extend({
 	},
 
 	// Main method
-	ajax: function( url , s ) {
+	// (s is used internally)
+	ajax: function( url , options , s ) {
 		
+		// Handle varargs
 		if ( arguments.length === 1 ) {
-			s = url;
-			url = s ? s.url : undefined;
+			options = url;
+			url = options ? options.url : undefined;
 		}
 		
-		return jQuery.xhr().open( s ? s.type : undefined , url ).send( undefined , s );
+		// Force options to be an object
+		options = options || {};
 		
+		// Get the url if provided separately
+		options.url = url || options.url;
+		
+		// Create the final options object
+		s = jQuery.extend( true , {} , jQuery.ajaxSettings , options );
+		
+		// We force the original context
+		// (plain objects used as context get extended)
+		s.context = options.context;
+		
+		var // jQuery lists
+			jQuery_lastModified = jQuery.lastModified,
+			jQuery_etag = jQuery.etag,
+			// Callbacks contexts
+			callbackContext = s.context || s,
+			globalEventContext = s.context ? jQuery( s.context ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// The jXHR state
+			state = 0,
+			// Loop variable
+			i,
+			// Fake xhr
+			jXHR = {
+				
+				readyState: 0,
+				
+				// Caches the header
+				setRequestHeader: function(name,value) {
+					if ( state === 0 ) {
+						requestHeaders[ name.toLowerCase() ] = value;
+					}
+					return this;
+				},
+				
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+				
+				// Builds headers hashtable if needed
+				// (match is used internally)
+				getResponseHeader: function( key , match ) {
+					
+					if ( state !== 2 ) {
+						return null;
+					}
+					
+					if ( responseHeaders === undefined ) {
+						
+						responseHeaders = {};
+						
+						if ( typeof responseHeadersString === "string" ) {
+							
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+							}
+						}
+					}
+					return responseHeaders[ key.toLowerCase() ];
+				},
+				
+				// Cancel the request
+				abort: function( statusText ) {
+					if ( transport && state !== 2 ) {
+						transport.abort( statusText || "abort" );
+						done( 0 , statusText );
+					}
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status , statusText , response , headers) {
+			
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+			
+			// State is "done" now
+			state = 2;
+			
+			// Set readyState
+			jXHR.readyState = status ? 4 : 0;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout(timeoutTimer);
+			}
+			
+			var // Reference url
+				url = s.url,
+				// and ifModified status
+				ifModified = s.ifModified,
+				
+				// Is it a success?
+				isSuccess = 0,
+				// Stored success
+				success,
+				// Stored error
+				error = statusText;
+			
+			// If not timeout, force a jQuery-compliant status text
+			if ( statusText != "timeout" ) {
+				statusText = ( status >= 200 && status < 300 ) ? 
+					"success" :
+					( status === 304 ? "notmodified" : "error" );
+			}
+			
+			// If successful, handle type chaining
+			if ( statusText === "success" || statusText === "notmodified" ) {
+				
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					
+					var lastModified = jXHR.getResponseHeader("Last-Modified"),
+						etag = jXHR.getResponseHeader("Etag");
+						
+					if (lastModified) {
+						jQuery_lastModified[ s.url ] = lastModified;
+					}
+					if (etag) {
+						jQuery_etag[ s.url ] = etag;
+					}
+				}
+				
+				if ( s.ifModified && statusText === "notmodified" ) {
+					
+					success = null;
+					isSuccess = 1;
+					
+				} else {
+					// Chain data conversions and determine the final value
+					// (if an exception is thrown in the process, it'll be notified as an error)
+					try {
+						
+						var i,
+							current,
+							prev,
+							checker,
+							conv1,
+							conv2,
+							oneConv,
+							convertion,
+							dataTypes = s.dataTypes,
+							dataConverters = s.dataConverters,
+							responses = {
+								"xml": "XML",
+								"text": "Text"
+							};
+						
+						for( i = 0 ; i < dataTypes.length ; i++ ) {
+							
+							current = dataTypes[ i ];
+							
+							if ( responses[ current ] ) {
+								jXHR[ "response" + responses[ current ] ] = response;
+								responses[ current ] = 0;
+							}
+							
+							if ( i ) {
+								
+								if ( prev !== "*" && current !== "*" && prev !== current ) {
+								
+									oneConv = conv1 = 
+										dataConverters[ ( conversion = prev + " " + current ) ] ||
+										dataConverters[ "* " + current ];
+									
+									if ( oneConv !== true ) {
+										
+										if ( ! oneConv && prev !== "text" && current !== "text" ) {
+											conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+											conv2 = dataConverters[ "text " + current ];
+										}
+										
+										if ( oneConv || conv1 && conv2 ) {
+											response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+										} else {
+											throw "no " + conversion;
+										}
+									}
+								}
+							} else if ( s.dataFilter ) {
+								
+								response = s.dataFilter( response );
+								dataTypes = s.dataTypes;
+							}
+							
+							prev = current;
+						}
+		
+						// We have a real success
+						success = response;
+						isSuccess = 1;
+						
+					} catch(e) {
+						
+						statusText = "parsererror";
+						error = "" + e;
+						
+					}
+				}
+				
+			} else { // if not success, mark it as an error
+				
+					error = error || statusText;
+			}
+				
+			// Set data for the fake xhr object
+			jXHR.status = status;
+			jXHR.statusText = statusText;
+			
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.fire( callbackContext , [ success , statusText , jXHR ] );
+			} else {
+				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
+			}
+			
+			if ( s.global ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
+						[ jXHR , s , isSuccess ? success : error ] );
+			}
+			
+			// Complete
+			completeDeferred.fire( callbackContext, [ jXHR , statusText ] );
+			
+			if ( s.global ) {
+				globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] );
+				// Handle the global AJAX counter
+				if ( ! --jQuery.active ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+		
+		// Attach deferreds	
+		jXHR.success = jXHR.then = deferred.then;
+		jXHR.error = jXHR.fail = deferred.fail;
+		jXHR.complete = completeDeferred.then;
+
+		// Remove hash character (#7531: and string promotion)
+		s.url = ( "" + s.url ).replace( rhash , "" );
+		
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+		
+		// Determine if request has content
+		s.hasContent = ! rnoContent.test( s.type );
+		
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
+		
+		// Determine if a cross-domain request is in order
+		var parts = rurl.exec( s.url.toLowerCase() ),
+			loc = location;
+		s.crossDomain = !!( parts && ( parts[ 1 ] && parts[ 1 ] != loc.protocol || parts[ 2 ] != loc.host ) );
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data != "string" ) {
+			s.data = jQuery.param( s.data , s.traditional );
+		}
+
+		// Watch for a new set of requests
+		if ( s.global && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+		
+		// Get transport
+		transport = jQuery.ajax.prefilter( s ).transport( s );
+		
+		// If no transport, we auto-abort
+		if ( ! transport ) {
+			
+			done( 0 , "transport not found" );
+			jXHR = false;
+			
+		} else {
+			
+			// More options handling for requests with no content
+			if ( ! s.hasContent ) {
+				
+				// If data is available, append data to url
+				if ( s.data ) {
+					s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				}
+								
+				// Add anti-cache in url if needed
+				if ( s.cache === false ) {
+					
+					var ts = jQuery.now(),
+						// try replacing _= if it is there
+						ret = s.url.replace( rts , "$1_=" + ts );
+						
+					// if nothing was replaced, add timestamp to the end
+					s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
+				}
+			}
+			
+			// Set the correct header, if data is being sent
+			if ( ( s.data && s.hasContent ) || options.contentType ) {
+				requestHeaders[ "content-type" ] = s.contentType;
+			}
+		
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery_lastModified[ s.url ] ) { 
+					requestHeaders[ "if-modified-since" ] = jQuery_lastModified[ s.url ];
+				}
+				if ( jQuery_etag[ s.url ] ) {
+					requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
+				}
+			}
+		
+			// Set the Accepts header for the server, depending on the dataType
+			requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+				s.accepts[ "*" ];
+				
+			// Check for headers option
+			for ( i in s.headers ) {
+				requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
+			}
+			
+			// Allow custom headers/mimetypes and early abort
+			if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
+					
+					// Abort if not done already
+					done( 0 , "abort" );
+					jXHR = false;
+					
+			} else {
+				
+				// Set state as sending
+				state = 1;
+				jXHR.readyState = 1;
+				
+				// Install callbacks on deferreds
+				for ( i in { success:1, error:1, complete:1 } ) {
+					jXHR[ i ]( s[ i ] );
+				}
+				
+				// Send global event
+				if ( s.global ) {
+					globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] );
+				}
+				
+				// Timeout
+				if ( s.async && s.timeout > 0 ) {
+					timeoutTimer = setTimeout(function(){
+						jXHR.abort( "timeout" );
+					}, s.timeout);
+				}
+				
+				// Try to send
+				try {
+					transport.send(requestHeaders, done);
+				} catch (e) {
+					// Propagate exception as error if not done
+					if ( status === 1 ) {
+
+						done(0, "error", "" + e);
+						jXHR = false;
+						
+					// Simply rethrow otherwise
+					} else {
+						jQuery.error(e);
+					}
+				}
+			}
+		}
+		
+		return jXHR;
 	},
 
 	// Serialize an array of form elements or a set of
@@ -330,6 +730,172 @@ jQuery.extend({
 
 });
 
+//Execute or select from functions in a given structure of options
+function ajax_selectOrExecute( structure , s ) {
+
+	var dataTypes = s.dataTypes,
+		transportDataType,
+		list,
+		selected,
+		i,
+		length,
+		checked = {},
+		flag,
+		noSelect = structure !== "transports";
+		
+	function initSearch( dataType ) {
+
+		flag = transportDataType !== dataType && ! checked[ dataType ];
+		
+		if ( flag ) {
+			
+			checked[ dataType ] = 1;
+			transportDataType = dataType;
+			list = s[ structure ][ dataType ];
+			i = -1;
+			length = list ? list.length : 0 ;
+		}
+
+		return flag;
+	}
+	
+	initSearch( dataTypes[ 0 ] );
+
+	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
+		
+		if ( i === length ) {
+			
+			initSearch( "*" );
+			
+		} else {
+
+			selected = list[ i ]( s , determineDataType );
+
+			// If we got redirected to another dataType
+			// Search there (if not in progress or already tried)
+			if ( typeof( selected ) === "string" &&
+				initSearch( selected ) ) {
+
+				dataTypes.unshift( selected );
+				selected = 0;
+			}
+		}
+	}
+
+	return noSelect ? jQuery.ajax : selected;
+}
+
+// Add an element to one of the structures in ajaxSettings
+function ajax_addElement( structure , args ) {
+		
+	var i,
+		start = 0,
+		length = args.length,
+		dataTypes = [ "*" ],
+		dLength = 1,
+		dataType,
+		functors = [],
+		first,
+		append,
+		list;
+		
+	if ( length ) {
+		
+		first = jQuery.type( args[ 0 ] );
+		
+		if ( first === "object" ) {
+			return ajax_selectOrExecute( structure , args[ 0 ] );
+		}
+		
+		structure = jQuery.ajaxSettings[ structure ];
+		
+		if ( first !== "function" ) {
+			
+			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
+			dLength = dataTypes.length;
+			start = 1;
+			
+		}
+		
+		if ( dLength && start < length ) {
+			
+			functors = sliceFunc.call( args , start );
+					
+			for( i = 0 ; i < dLength ; i++ ) {
+				
+				dataType = dataTypes[ i ];
+				
+				first = /^\+/.test( dataType );
+				
+				if (first) {
+					dataType = dataType.substr(1);
+				}
+				
+				if ( dataType !== "" ) {
+				
+					append = Array.prototype[ first ? "unshift" : "push" ];
+					list = structure[ dataType ] = structure[ dataType ] || [];
+					append.apply( list , functors );
+				}
+			}
+		}
+	}
+	
+	return jQuery.ajax;
+}
+
+// Install prefilter & transport methods
+jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
+	_ = name + "s";
+	jQuery.ajax[ name ] = function() {
+		return ajax_addElement( _ , arguments );
+	};
+} );
+	
+// Utility function that handles dataType when response is received
+// (for those transports that can give text or xml responses)
+function determineDataType( s , ct , text , xml ) {
+	
+	var autoDataType = s.autoDataType,
+		type,
+		regexp,
+		dataTypes = s.dataTypes,
+		transportDataType = dataTypes[0],
+		response;
+	
+	// Auto (xml, json, script or text determined given headers)
+	if ( transportDataType === "*" ) {
+
+		for ( type in autoDataType ) {
+			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
+				transportDataType = dataTypes[0] = type;
+				break;
+			}
+		}			
+	} 
+	
+	// xml and parsed as such
+	if ( transportDataType === "xml" &&
+		xml &&
+		xml.documentElement /* #4958 */ ) {
+		
+		response = xml;
+	
+	// Text response was provided
+	} else {
+		
+		response = text;
+		
+		// If it's not really text, defer to dataConverters
+		if ( transportDataType !== "text" ) {
+			dataTypes.unshift( "text" );
+		}
+		
+	}
+	
+	return response;
+}	
+
 /*
  * Create the request object; Microsoft failed to properly
  * implement the XMLHttpRequest in IE7 (can't request local files),
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index a685bb196..f16b394ba 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -14,7 +14,7 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 // 2) sneakily ensure transportDataType is json
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
-jQuery.xhr.prefilter("json jsonp", function(s) {
+jQuery.ajax.prefilter("json jsonp", function(s) {
 	
 	var transportDataType = s.dataTypes[ 0 ];
 	
diff --git a/src/transports/script.js b/src/transports/script.js
index 374893c04..06b4b7723 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -17,7 +17,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.transport("script", function(s) {
+jQuery.ajax.transport("script", function(s) {
 	
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 978f6c259..5845087b8 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrUnloadAbortMarker = [];
 
 	
-jQuery.xhr.transport( function( s , determineDataType ) {
+jQuery.ajax.transport( function( s , determineDataType ) {
 	
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
diff --git a/src/xhr.js b/src/xhr.js
deleted file mode 100644
index 0ff7665b2..000000000
--- a/src/xhr.js
+++ /dev/null
@@ -1,728 +0,0 @@
-(function( jQuery ) {
-
-var rquery_xhr = /\?/,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
-	rnoContent = /^(?:GET|HEAD)$/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	
-	sliceFunc = Array.prototype.slice;
-	
-// Creates a jQuery xhr object
-jQuery.xhr = function( _native ) {
-	
-	if ( _native ) {
-		return jQuery.ajaxSettings.xhr();
-	}
-	
-	function reset( force ) {
-		
-		// We only need to reset if we went through the init phase
-		// (with the exception of object creation)
-		if ( force || internal ) {
-			
-			// Reset callbacks lists
-			deferred = jQuery.Deferred();
-			completeDeferred = jQuery._Deferred();
-			
-			xhr.success = xhr.then = deferred.then;
-			xhr.error = xhr.fail = deferred.fail;
-			xhr.complete = completeDeferred.then;
-			
-			// Reset private variables
-			requestHeaders = {};
-			responseHeadersString = responseHeaders = internal = done = timeoutTimer = s = undefined;
-			
-			// Reset state
-			xhr.readyState = 0;
-			sendFlag = 0;
-			
-			// Remove responseX fields
-			for ( var name in xhr ) {
-				if ( /^response/.test(name) ) {
-					delete xhr[name];
-				}
-			}
-		}
-	}
-	
-	function init() {
-		
-		var // Options extraction
-		
-			// Remove hash character (#7531: first for string promotion)
-			url = s.url = ( "" + s.url ).replace( rhash , "" ),
-			
-			// Uppercase the type
-			type = s.type = s.type.toUpperCase(),
-			
-			// Determine if request has content
-			hasContent = s.hasContent = ! rnoContent.test( type ),
-			
-			// Extract dataTypes list
-			dataType = s.dataType,
-			dataTypes = s.dataTypes = dataType ? jQuery.trim(dataType).toLowerCase().split(/\s+/) : ["*"],
-			
-			// Determine if a cross-domain request is in order
-			parts = rurl.exec( url.toLowerCase() ),
-			loc = location,
-			crossDomain = s.crossDomain = !!( parts && ( parts[1] && parts[1] != loc.protocol || parts[2] != loc.host ) ),
-			
-			// Get other options locally
-			data = s.data,
-			originalContentType = s.contentType,
-			prefilters = s.prefilters,
-			accepts = s.accepts,
-			headers = s.headers,
-			
-			// Other Variables
-			transportDataType,
-			i;
-			
-		// Convert data if not already a string
-		if ( data && s.processData && typeof data != "string" ) {
-			data = s.data = jQuery.param( data , s.traditional );
-		}
-
-		// Get internal
-		internal = jQuery.xhr.prefilter( s ).transport( s );
-		
-		// Re-actualize url & data
-		url = s.url;
-		data = s.data;
-		
-		// If internal was found
-		if ( internal ) {
-			
-			// Get transportDataType
-			transportDataType = dataTypes[0];
-			
-			// More options handling for requests with no content
-			if ( ! hasContent ) {
-				
-				// If data is available, append data to url
-				if ( data ) {
-					url += (rquery_xhr.test(url) ? "&" : "?") + data;
-				}
-								
-				// Add anti-cache in url if needed
-				if ( s.cache === false ) {
-					
-					var ts = jQuery.now(),
-						// try replacing _= if it is there
-						ret = url.replace(rts, "$1_=" + ts );
-						
-					// if nothing was replaced, add timestamp to the end
-					url = ret + ((ret == url) ? (rquery_xhr.test(url) ? "&" : "?") + "_=" + ts : "");
-				}
-				
-				s.url = url;
-			}
-			
-			// Set the correct header, if data is being sent
-			if ( ( data && hasContent ) || originalContentType ) {
-				requestHeaders["content-type"] = s.contentType;
-			}
-		
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery_lastModified[url] ) { 
-					requestHeaders["if-modified-since"] = jQuery_lastModified[url];
-				}
-				if ( jQuery_etag[url] ) {
-					requestHeaders["if-none-match"] = jQuery_etag[url];
-				}
-			}
-		
-			// Set the Accepts header for the server, depending on the dataType
-			requestHeaders.accept = transportDataType && accepts[ transportDataType ] ?
-				accepts[ transportDataType ] + ( transportDataType !== "*" ? ", */*; q=0.01" : "" ) :
-				accepts[ "*" ];
-				
-			// Check for headers option
-			for ( i in headers ) {
-				requestHeaders[ i.toLowerCase() ] = headers[ i ];
-			}			
-		}
-		
-		callbackContext = s.context || s;
-		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
-		
-		for ( i in { success:1, error:1, complete:1 } ) {
-			xhr[ i ]( s[ i ] );
-		}
-		
-		// Watch for a new set of requests
-		if ( s.global && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-		
-		done = whenDone;
-	}
-	
-	function whenDone(status, statusText, response, headers) {
-		
-		// Called once
-		done = undefined;
-		
-		// Reset sendFlag
-		sendFlag = 0;
-		
-		// Cache response headers
-		responseHeadersString = headers || "";
-
-		// Clear timeout if it exists
-		if ( timeoutTimer ) {
-			clearTimeout(timeoutTimer);
-		}
-		
-		var // Reference url
-			url = s.url,
-			// and ifModified status
-			ifModified = s.ifModified,
-			
-			// Is it a success?
-			isSuccess = 0,
-			// Stored success
-			success,
-			// Stored error
-			error = statusText;
-
-		// If not timeout, force a jQuery-compliant status text
-		if ( statusText != "timeout" ) {
-			statusText = ( status >= 200 && status < 300 ) ? 
-				"success" :
-				( status === 304 ? "notmodified" : "error" );
-		}
-		
-		// If successful, handle type chaining
-		if ( statusText === "success" || statusText === "notmodified" ) {
-			
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( ifModified ) {
-				var lastModified = xhr.getResponseHeader("Last-Modified"),
-					etag = xhr.getResponseHeader("Etag");
-					
-				if (lastModified) {
-					jQuery_lastModified[url] = lastModified;
-				}
-				if (etag) {
-					jQuery_etag[url] = etag;
-				}
-			}
-			
-			if ( ifModified && statusText === "notmodified" ) {
-				
-				success = null;
-				isSuccess = 1;
-				
-			} else {
-				// Chain data conversions and determine the final value
-				// (if an exception is thrown in the process, it'll be notified as an error)
-				try {
-					
-					var i,
-						current,
-						prev,
-						checker,
-						conv1,
-						conv2,
-						oneConv,
-						convertion,
-						dataTypes = s.dataTypes,
-						dataConverters = s.dataConverters,
-						dataFilter = s.dataFilter,
-						responses = {
-							"xml": "XML",
-							"text": "Text"
-						};
-					
-					for( i = 0 ; i < dataTypes.length ; i++ ) {
-						
-						current = dataTypes[ i ];
-						
-						if ( responses[ current ] ) {
-							xhr[ "response" + responses[ current ] ] = response;
-							responses[ current ] = 0;
-						}
-						
-						if ( i ) {
-							
-							if ( prev !== "*" && current !== "*" && prev !== current ) {
-							
-								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " " + current ) ] ||
-									dataConverters[ "* " + current ];
-								
-								if ( oneConv !== true ) {
-									
-									if ( ! oneConv && prev !== "text" && current !== "text" ) {
-										conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-										conv2 = dataConverters[ "text " + current ];
-									}
-									
-									if ( oneConv || conv1 && conv2 ) {
-										response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-									} else {
-										throw "no " + conversion;
-									}
-								}
-							}
-						} else if ( dataFilter ) {
-							
-							response = s.dataFilter( response );
-							dataTypes = s.dataTypes;
-						}
-						
-						prev = current;
-					}
-	
-					// We have a real success
-					success = response;
-					isSuccess = 1;
-					
-				} catch(e) {
-					
-					statusText = "parsererror";
-					error = "" + e;
-					
-				}
-			}
-			
-		} else { // if not success, mark it as an error
-			
-				error = error || statusText;
-				
-		}
-			
-		// Set data for the fake xhr object
-		xhr.status = status;
-		xhr.statusText = statusText;
-		
-		// Keep local copies of vars in case callbacks re-use the xhr
-		var _s = s,
-			_deferred = deferred,
-			_completeDeferred = completeDeferred,
-			_callbackContext = callbackContext,
-			_globalEventContext = globalEventContext;
-			
-			
-		// Set state if the xhr hasn't been re-used
-		function _setState( value ) {
-			if ( xhr.readyState && s === _s ) {
-				setState( value );
-			}
-		}
-				
-		// Really completed?
-		if ( status && s.async ) {
-			setState( 2 );
-			_setState( 3 );
-		}
-		
-		// We're done
-		_setState( 4 );
-		
-		// Success/Error
-		if ( isSuccess ) {
-			_deferred.fire( _callbackContext , [ success , statusText , xhr ] );
-		} else {
-			_deferred.fireReject( _callbackContext , [ xhr , statusText , error ] );
-		}
-		
-		if ( _s.global ) {
-			_globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , [ xhr , _s , isSuccess ? success : error ] );
-		}
-		
-		// Complete
-		_completeDeferred.fire( _callbackContext, [ xhr , statusText ] );
-		
-		if ( _s.global ) {
-			_globalEventContext.trigger( "ajaxComplete", [xhr, _s] );
-			// Handle the global AJAX counter
-			if ( ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-	}
-	
-	// Ready state control
-	function checkState( expected , test ) {
-		if ( expected !== true && ( expected === false || test === false || xhr.readyState !== expected ) ) {
-			jQuery.error("INVALID_STATE_ERR");
-		}
-	}
-	
-	// Ready state change
-	function setState( value ) {
-		xhr.readyState = value;
-		if ( jQuery.isFunction( xhr.onreadystatechange ) ) {
-			xhr.onreadystatechange();
-		}
-	}
-	
-	var // jQuery lists
-		jQuery_lastModified = jQuery.lastModified,
-		jQuery_etag = jQuery.etag,
-		// Options object
-		s,
-		// Callback stuff
-		callbackContext,
-		globalEventContext,
-		deferred,
-		completeDeferred,
-		// Headers (they are sent all at once)
-		requestHeaders,
-		// Response headers
-		responseHeadersString,
-		responseHeaders,
-		// Done callback
-		done,
-		// transport
-		internal,
-		// timeout handle
-		timeoutTimer,
-		// The send flag
-		sendFlag,
-		// Fake xhr
-		xhr = {
-			// state
-			readyState: 0,
-			
-			// Callback
-			onreadystatechange: null,
-			
-			// Open
-			open: function(type, url, async, username, password) {
-				
-				xhr.abort();
-				reset();
-				
-				s = {
-					type: type,
-					url: url,
-					async: async,
-					username: username,
-					password: password
-				};
-				
-				setState(1);
-				
-				return xhr;
-			},
-			
-			// Send
-			send: function(data, moreOptions) {
-				
-				checkState(1 , !sendFlag);
-				
-				s.data = data;
-				
-				s = jQuery.extend( true,
-					{},
-					jQuery.ajaxSettings,
-					s,
-					moreOptions || ( moreOptions === false ? { global: false } : {} ) );
-					
-				if ( moreOptions ) {
-					// We force the original context
-					// (plain objects used as context get extended)
-					s.context = moreOptions.context;
-				}
-				
-				init();
-				
-				// If not internal, abort
-				if ( ! internal ) {
-					done( 0 , "transport not found" );
-					return false;
-				}
-				
-				// Allow custom headers/mimetypes and early abort
-				if ( s.beforeSend ) {
-					
-					var _s = s;
-					
-					if ( s.beforeSend.call(callbackContext, xhr, s) === false || ! xhr.readyState || _s !== s ) {
-						
-						// Abort if not done
-						if ( xhr.readyState && _s === s ) {
-							xhr.abort();
-						}
-	
-						// Handle the global AJAX counter
-						if ( _s.global && ! --jQuery.active ) {
-							jQuery.event.trigger( "ajaxStop" );
-						}
-						
-						return false;
-					}
-				}
-				
-				sendFlag = 1;
-				
-				// Send global event
-				if ( s.global ) {
-					globalEventContext.trigger("ajaxSend", [xhr, s]);
-				}
-				
-				// Timeout
-				if ( s.async && s.timeout > 0 ) {
-					timeoutTimer = setTimeout(function(){
-						xhr.abort("timeout");
-					}, s.timeout);
-				}
-				
-				if ( s.async ) {
-					setState(1);
-				}
-				
-				try {
-					
-					internal.send(requestHeaders, done);
-					return xhr;
-											
-				} catch (e) {
-					
-					if ( done ) {
-						
-						done(0, "error", "" + e);
-						
-					} else {
-						
-						jQuery.error(e);
-						
-					}
-				}
-				
-				return false;
-			},
-			
-			// Caches the header
-			setRequestHeader: function(name,value) {
-				checkState(1, !sendFlag);
-				requestHeaders[ name.toLowerCase() ] = value;
-				return xhr;
-			},
-			
-			// Raw string
-			getAllResponseHeaders: function() {
-				return xhr.readyState <= 1 ? "" : responseHeadersString;
-			},
-			
-			// Builds headers hashtable if needed
-			getResponseHeader: function( key ) {
-				
-				if ( xhr.readyState <= 1 ) {
-					
-					return null;
-					
-				}
-				
-				if ( responseHeaders === undefined ) {
-					
-					responseHeaders = {};
-					
-					if ( typeof responseHeadersString === "string" ) {
-						
-						var match;
-						
-						while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-							responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
-						}
-					}
-				}
-				return responseHeaders[ key.toLowerCase() ];
-			},
-			
-			// Cancel the request
-			abort: function(statusText) {
-				if (internal) {
-					internal.abort( statusText || "abort" );
-				}
-				xhr.readyState = 0;
-			}
-		};
-		
-	// Init data (so that we can bind callbacks early
-	reset(1);
-
-	// Return the xhr emulation
-	return xhr;
-};
-
-// Execute or select from functions in a given structure of options
-function xhr_selectOrExecute( structure , s ) {
-
-	var dataTypes = s.dataTypes,
-		transportDataType,
-		list,
-		selected,
-		i,
-		length,
-		checked = {},
-		flag,
-		noSelect = structure !== "transports";
-		
-	function initSearch( dataType ) {
-
-		flag = transportDataType !== dataType && ! checked[ dataType ];
-		
-		if ( flag ) {
-			
-			checked[ dataType ] = 1;
-			transportDataType = dataType;
-			list = s[ structure ][ dataType ];
-			i = -1;
-			length = list ? list.length : 0 ;
-		}
-
-		return flag;
-	}
-	
-	initSearch( dataTypes[ 0 ] );
-
-	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
-		
-		if ( i === length ) {
-			
-			initSearch( "*" );
-			
-		} else {
-
-			selected = list[ i ]( s , determineDataType );
-
-			// If we got redirected to another dataType
-			// Search there (if not in progress or already tried)
-			if ( typeof( selected ) === "string" &&
-				initSearch( selected ) ) {
-
-				dataTypes.unshift( selected );
-				selected = 0;
-			}
-		}
-	}
-
-	return noSelect ? jQuery.xhr : selected;
-}
-
-// Add an element to one of the xhr structures in ajaxSettings
-function xhr_addElement( structure , args ) {
-		
-	var i,
-		j,
-		start = 0,
-		length = args.length,
-		dataTypes = [ "*" ],
-		dLength = 1,
-		dataType,
-		functors = [],
-		first,
-		append,
-		list;
-		
-	if ( length ) {
-		
-		first = jQuery.type( args[ 0 ] );
-		
-		if ( first === "object" ) {
-			return xhr_selectOrExecute( structure , args[ 0 ] );
-		}
-		
-		structure = jQuery.ajaxSettings[ structure ];
-		
-		if ( first !== "function" ) {
-			
-			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-			dLength = dataTypes.length;
-			start = 1;
-			
-		}
-		
-		if ( dLength && start < length ) {
-			
-			functors = sliceFunc.call( args , start );
-			
-			length -= start;
-					
-			for( i = 0 ; i < dLength ; i++ ) {
-				
-				dataType = dataTypes[ i ];
-				
-				first = /^\+/.test( dataType );
-				
-				if (first) {
-					dataType = dataType.substr(1);
-				}
-				
-				if ( dataType !== "" ) {
-				
-					append = Array.prototype[ first ? "unshift" : "push" ];
-					
-					list = structure[ dataType ] = structure[ dataType ] || [];
-			
-					for ( j = 0; j < length; j++ ) {
-						append.call( list , functors[ j ] );
-					}
-				}
-			}
-		}
-	}
-	
-	return jQuery.xhr;
-}
-
-// Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-	_ = name + "s";
-	jQuery.xhr[ name ] = function() {
-		return xhr_addElement( _ , arguments );
-	};
-} );
-	
-// Utility function that handles dataType when response is received
-// (for those transports that can give text or xml responses)
-function determineDataType( s , ct , text , xml ) {
-	
-	var autoDataType = s.autoDataType,
-		type,
-		regexp,
-		dataTypes = s.dataTypes,
-		transportDataType = dataTypes[0],
-		response;
-	
-	// Auto (xml, json, script or text determined given headers)
-	if ( transportDataType === "*" ) {
-
-		for ( type in autoDataType ) {
-			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
-				transportDataType = dataTypes[0] = type;
-				break;
-			}
-		}			
-	} 
-	
-	// xml and parsed as such
-	if ( transportDataType === "xml" &&
-		xml &&
-		xml.documentElement /* #4958 */ ) {
-		
-		response = xml;
-	
-	// Text response was provided
-	} else {
-		
-		response = text;
-		
-		// If it's not really text, defer to dataConverters
-		if ( transportDataType !== "text" ) {
-			dataTypes.unshift( "text" );
-		}
-		
-	}
-	
-	return response;
-}	
-
-})( jQuery );
diff --git a/test/index.html b/test/index.html
index 238b7d582..accd349f9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,7 +20,6 @@
 	<script src="../src/manipulation.js"></script>
 	<script src="../src/css.js"></script>
 	<script src="../src/ajax.js"></script>
-	<script src="../src/xhr.js"></script>
 	<script src="../src/transports/jsonp.js"></script>
 	<script src="../src/transports/script.js"></script>
 	<script src="../src/transports/xhr.js"></script>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 222dd9a38..85430eb82 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -74,7 +74,7 @@ test("jQuery.ajax() - success/error callbacks (remote)", function() {
 	
 	var supports = jQuery.support.cors;
 	
-	expect( supports ? 9 : 6 );
+	expect( supports ? 9 : 4 );
 
 	jQuery.ajaxSetup({ timeout: 0 });
 
@@ -102,8 +102,8 @@ test("jQuery.ajax() - success/error callbacks (remote)", function() {
 			dataType: "text",
 			beforeSend: function(){ ok(supports, "beforeSend"); },
 			success: function( val ){ ok(supports, "success"); ok(supports && val.length, "data received"); },
-			error: function(_ , a , b ){ ok(!supports, "error"); },
-			complete: function(){ ok(true, "complete"); }
+			error: function(_ , a , b ){ ok(false, "error"); },
+			complete: function(){ ok(supports, "complete"); }
 		});
 	}, 13);
 });
@@ -409,136 +409,6 @@ test("jQuery.ajax() - abort", function() {
 	equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
 });
 
-test("jQuery.ajax() - readyState (success)", function() {
-	expect( 1 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-	
-	var control = "";
-
-	setTimeout(function(){
-		jQuery.ajax({
-			url: url("data/name.html"),
-			beforeSend: function( xhr ) {
-				xhr.onreadystatechange = function() {
-					control += xhr.readyState;
-				}
-			},
-			complete: function(){ 
-				setTimeout( function() {
-					equals( control , "1234" , "onreadystatechange was properly called" );
-				}, 13 );
-				start();
-			}
-		});
-	}, 13);
-});
-
-test("jQuery.ajax() - readyState (abort)", function() {
-	expect( 2 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-	
-	var control = "";
-
-	setTimeout(function(){
-
-		jQuery.ajaxSetup({ timeout: 500 });
-
-		jQuery.ajax({
-			url: url("data/name.php?wait=5"),
-			beforeSend: function( xhr ) {
-				xhr.onreadystatechange = function() {
-					control += xhr.readyState;
-				}
-			},
-			complete: function( xhr ){ 
-				setTimeout( function() {
-					equals( control , "14" , "onreadystatechange was properly called" );
-					equals( xhr.readyState, 0 , "readyState is 0" );
-				}, 13 );
-				start();
-			}
-		});
-	}, 13);
-});
-
-test("jQuery.xhr() - reuse", function() {
-	expect( 15 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-	
-	var number = 0;
-	
-	setTimeout(function(){
-		jQuery('#foo').ajaxStart(function(){
-			ok( true, "ajaxStart" );
-		}).ajaxStop(function(){
-			ok( true, "ajaxStop" );
-			start();
-		}).ajaxSend(function(){
-			number++;
-			ok( true, "ajaxSend (" + number +")" );
-		}).ajaxComplete(function(){
-			ok( true, "ajaxComplete (" + number +")" );
-		}).ajaxError(function(){
-			ok( false, "ajaxError (" + number +")" );
-		}).ajaxSuccess(function(){
-			ok( true, "ajaxSuccess (" + number +")" );
-		});
-
-		jQuery.ajax({
-			url: url("data/name.html"),
-			beforeSend: function(){ ok(true, "beforeSend (1)"); },
-			success: function( _1 , _2 , xhr ){
-				ok(true, "success (1)");
-				xhr.complete(function() {
-					ok(true, "complete (1bis)"); 
-				});
-				xhr.open( "GET", url("data/name.html") );
-				xhr.success( function(){ ok(true, "beforeSend (2)"); } )
-				xhr.send( null, {
-					success: function(){ ok(true, "success (2)"); },
-					error: function(){ ok(false, "error (2)"); },
-					complete: function(){ ok(true, "complete (2)"); }
-				} );
-			},
-			error: function(){ ok(false, "error (1)"); },
-			complete: function(){ ok(true, "complete (1)"); }
-		});
-	}, 13);
-});
-
-test("jQuery.xhr() - early binding", function() {
-	expect( 2 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-	
-	jQuery.xhr()
-		.success( function(){ ok(true, "success"); } )
-		.error( function(){ ok(false, "error"); } )
-		.complete( function(){ ok(true, "complete"); start(); } )
-		.open( "GET", url("data/name.html") )
-		.send();
-});
-
-test("jQuery.xhr() - get native implementation", function() {
-	
-	var xhr = jQuery.xhr(true);
-	
-	ok( xhr.readyState !== undefined , "implements XMLHttpRequest" );
-	ok( ! jQuery.isFunction( xhr.success ) , "is not jQuery's abstraction" );
-	
-});
-
 test("Ajax events with context", function() {
 	expect(14);
 	
@@ -653,34 +523,6 @@ test("jQuery.ajax() - disabled globals", function() {
 	});
 });
 
-test("jQuery.xhr() - disabled globals through xhr.send(data , false)", function() {
-	expect( 2 );
-	stop();
-
-	jQuery('#foo').ajaxStart(function(){
-		ok( false, "ajaxStart" );
-	}).ajaxStop(function(){
-		ok( false, "ajaxStop" );
-	}).ajaxSend(function(){
-		ok( false, "ajaxSend" );
-	}).ajaxComplete(function(){
-		ok( false, "ajaxComplete" );
-	}).ajaxError(function(){
-		ok( false, "ajaxError" );
-	}).ajaxSuccess(function(){
-		ok( false, "ajaxSuccess" );
-	});
-
-	jQuery.xhr()
-		.success(function(){ ok(true, "success"); })
-		.error(function(){ ok(false, "error"); })
-		.complete(function(){
-		  ok(true, "complete");
-		  setTimeout(function(){ start(); }, 13);
-		})
-		.open("GET", url("data/name.html")).send(undefined, false);
-});
-
 test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", function() {
 	expect(3);
 	stop();

From 85f0dda56289ed6c044dadb3a42b1a4d2ddb0891 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 23:00:25 +0100
Subject: [PATCH 029/110] Revised logic in data conversion to account for when
 dataFilter modifies the dataTypes list.

---
 src/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 9f8e2384e..33c364509 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -430,6 +430,8 @@ jQuery.extend({
 							
 							if ( i ) {
 								
+								prev = dataTypes[ i - 1 ];
+								
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
 									oneConv = conv1 = 
@@ -455,8 +457,6 @@ jQuery.extend({
 								response = s.dataFilter( response );
 								dataTypes = s.dataTypes;
 							}
-							
-							prev = current;
 						}
 		
 						// We have a real success

From 52b1709b94cf631e0641eebfa4f76b101528d93b Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 26 Dec 2010 10:35:14 -0600
Subject: [PATCH 030/110] Fix reliableHiddenOffsets test was not working
 properly when table cells have borders, causing unnecessary slowness in some
 browsers. Thanks to matjas for his $.support test page.

---
 src/support.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/support.js b/src/support.js
index 67b41c4a7..e4c3ea916 100644
--- a/src/support.js
+++ b/src/support.js
@@ -147,7 +147,7 @@
 			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
 		}
 
-		div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
+		div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
 		var tds = div.getElementsByTagName("td");
 
 		// Check if table cells still have offsetWidth/Height when they are set

From 1830db422628d1556377621612b401bac5afa40e Mon Sep 17 00:00:00 2001
From: Ben Alman <cowboy@rj3.net>
Date: Sun, 26 Dec 2010 18:51:29 +0000
Subject: [PATCH 031/110] WETness getting you down? Fear not, the $.get and
 $.post methods are now 866% DRYer. This fixes #7847.

---
 src/ajax.js | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 3f4f732bd..bac0ab182 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -113,9 +113,8 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp
 	};
 });
 
-jQuery.extend({
-
-	get: function( url, data, callback, type ) {
+jQuery.each( [ "GET", "POST" ], function( i, method ) {
+	jQuery[ method.toLowerCase() ] = function( url, data, callback, type ) {
 		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
@@ -124,13 +123,16 @@ jQuery.extend({
 		}
 
 		return jQuery.ajax({
-			type: "GET",
+			type: method,
 			url: url,
 			data: data,
 			success: callback,
 			dataType: type
 		});
-	},
+	};
+});
+
+jQuery.extend({
 
 	getScript: function( url, callback ) {
 		return jQuery.get(url, null, callback, "script");
@@ -140,23 +142,6 @@ jQuery.extend({
 		return jQuery.get(url, data, callback, "json");
 	},
 
-	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
 	ajaxSetup: function( settings ) {
 		jQuery.extend( jQuery.ajaxSettings, settings );
 	},

From a939ade9c6d2b42be24031d902c86ec52847c0cc Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 26 Dec 2010 14:28:13 -0600
Subject: [PATCH 032/110] Fix whitespace in event.js

---
 src/event.js | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/event.js b/src/event.js
index fd470e718..22c958576 100644
--- a/src/event.js
+++ b/src/event.js
@@ -63,7 +63,7 @@ jQuery.event = {
 		var eventKey = elem.nodeType ? "events" : "__events__",
 			events = elemData[ eventKey ],
 			eventHandle = elemData.handle;
-			
+
 		if ( typeof events === "function" ) {
 			// On plain objects events is a fn that holds the the data
 			// which prevents this data from being JSON serialized
@@ -143,9 +143,9 @@ jQuery.event = {
 					}
 				}
 			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
 
 				if ( !handleObj.handler.guid ) {
 					handleObj.handler.guid = handler.guid;
@@ -184,7 +184,7 @@ jQuery.event = {
 		if ( !elemData || !events ) {
 			return;
 		}
-		
+
 		if ( typeof events === "function" ) {
 			elemData = events;
 			events = events.events;
@@ -222,7 +222,7 @@ jQuery.event = {
 				namespaces = type.split(".");
 				type = namespaces.shift();
 
-				namespace = new RegExp("(^|\\.)" + 
+				namespace = new RegExp("(^|\\.)" +
 					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
 			}
 
@@ -384,7 +384,7 @@ jQuery.event = {
 				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
 				special = jQuery.event.special[ targetType ] || {};
 
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
+			if ( (!special._default || special._default.call( elem, event ) === false) &&
 				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
 
 				try {
@@ -454,7 +454,7 @@ jQuery.event = {
 					event.handler = handleObj.handler;
 					event.data = handleObj.data;
 					event.handleObj = handleObj;
-	
+
 					var ret = handleObj.handler.apply( this, args );
 
 					if ( ret !== undefined ) {
@@ -553,7 +553,7 @@ jQuery.event = {
 			add: function( handleObj ) {
 				jQuery.event.add( this,
 					liveConvert( handleObj.origType, handleObj.selector ),
-					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); 
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
 			},
 
 			remove: function( handleObj ) {
@@ -583,7 +583,7 @@ jQuery.removeEvent = document.removeEventListener ?
 		if ( elem.removeEventListener ) {
 			elem.removeEventListener( type, handle, false );
 		}
-	} : 
+	} :
 	function( elem, type, handle ) {
 		if ( elem.detachEvent ) {
 			elem.detachEvent( "on" + type, handle );
@@ -630,7 +630,7 @@ jQuery.Event.prototype = {
 		if ( !e ) {
 			return;
 		}
-		
+
 		// if preventDefault exists run it on the original event
 		if ( e.preventDefault ) {
 			e.preventDefault();
@@ -726,7 +726,7 @@ if ( !jQuery.support.submitBubbles ) {
 						return trigger( "submit", this, arguments );
 					}
 				});
-	 
+
 				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
 					var elem = e.target,
 						type = elem.type;
@@ -788,7 +788,7 @@ if ( !jQuery.support.changeBubbles ) {
 		if ( e.type !== "focusout" || elem.type !== "radio" ) {
 			jQuery.data( elem, "_change_data", val );
 		}
-		
+
 		if ( data === undefined || val === data ) {
 			return;
 		}
@@ -802,7 +802,7 @@ if ( !jQuery.support.changeBubbles ) {
 
 	jQuery.event.special.change = {
 		filters: {
-			focusout: testChange, 
+			focusout: testChange,
 
 			beforedeactivate: testChange,
 
@@ -873,15 +873,15 @@ if ( document.addEventListener ) {
 				if ( focusCounts[fix]++ === 0 ) {
 					document.addEventListener( orig, handler, true );
 				}
-			}, 
-			teardown: function() { 
+			},
+			teardown: function() {
 				if ( --focusCounts[fix] === 0 ) {
 					document.removeEventListener( orig, handler, true );
 				}
 			}
 		};
 
-		function handler( e ) { 
+		function handler( e ) {
 			e = jQuery.event.fix( e );
 			e.type = fix;
 			return jQuery.event.trigger( e, null, e.target );
@@ -898,7 +898,7 @@ jQuery.each(["bind", "one"], function( i, name ) {
 			}
 			return this;
 		}
-		
+
 		if ( jQuery.isFunction( data ) || data === false ) {
 			fn = data;
 			data = undefined;
@@ -938,20 +938,20 @@ jQuery.fn.extend({
 
 		return this;
 	},
-	
+
 	delegate: function( selector, types, data, fn ) {
 		return this.live( types, data, fn, selector );
 	},
-	
+
 	undelegate: function( selector, types, fn ) {
 		if ( arguments.length === 0 ) {
 				return this.unbind( "live" );
-		
+
 		} else {
 			return this.die( types, null, fn, selector );
 		}
 	},
-	
+
 	trigger: function( type, data ) {
 		return this.each(function() {
 			jQuery.event.trigger( type, data, this );
@@ -1008,12 +1008,12 @@ jQuery.each(["live", "die"], function( i, name ) {
 		var type, i = 0, match, namespaces, preType,
 			selector = origSelector || this.selector,
 			context = origSelector ? this : jQuery( this.context );
-		
+
 		if ( typeof types === "object" && !types.preventDefault ) {
 			for ( var key in types ) {
 				context[ name ]( key, data, types[key], selector );
 			}
-			
+
 			return this;
 		}
 
@@ -1060,7 +1060,7 @@ jQuery.each(["live", "die"], function( i, name ) {
 				context.unbind( "live." + liveConvert( type, selector ), fn );
 			}
 		}
-		
+
 		return this;
 	};
 });
@@ -1079,7 +1079,7 @@ function liveHandler( event ) {
 	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
 		return;
 	}
-	
+
 	if ( event.namespace ) {
 		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
 	}

From 37d297c67fe3569a5a9d81586e14d4a887df7879 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 26 Dec 2010 14:28:49 -0600
Subject: [PATCH 033/110] Clearing event handlers on unload is no longer
 necessary in any version of IE. This issue causing memory leaks between pages
 was fixed in MS07-033.

---
 src/event.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/event.js b/src/event.js
index 22c958576..b66cfab6d 100644
--- a/src/event.js
+++ b/src/event.js
@@ -1177,21 +1177,4 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 	}
 });
 
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	jQuery(window).bind("unload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
-
 })( jQuery );

From 78a6f5b152f40739769169c76726cead5cb7206b Mon Sep 17 00:00:00 2001
From: Ben Alman <cowboy@rj3.net>
Date: Sun, 26 Dec 2010 22:49:01 +0000
Subject: [PATCH 034/110] Removed unnecessary upper/lowercase, it's all just
 lowercase now (since $.ajax will uppercase as-needed).

---
 src/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index bac0ab182..18ea203d0 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -113,8 +113,8 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp
 	};
 });
 
-jQuery.each( [ "GET", "POST" ], function( i, method ) {
-	jQuery[ method.toLowerCase() ] = function( url, data, callback, type ) {
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
 		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;

From faabb2c31883deabaddd5642eb5e708b5802f2b0 Mon Sep 17 00:00:00 2001
From: Alex Sexton <AlexSexton@gmail.com>
Date: Mon, 11 Oct 2010 11:54:00 -0500
Subject: [PATCH 035/110] Changed the expando string to use a random number
 instead of the time, so collisions become less likely. Also added jQuery
 version to instantly differentiate separate versions of jQuery (a common use
 case for noConflict, etc, when two jQuery instances are on the page). Fixes
 #6842.

---
 src/data.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/data.js b/src/data.js
index 732e9233b..bb7febfba 100644
--- a/src/data.js
+++ b/src/data.js
@@ -9,8 +9,9 @@ jQuery.extend({
 	// Please use with caution
 	uuid: 0,
 
-	// Unique for each copy of jQuery on the page	
-	expando: "jQuery" + jQuery.now(),
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
 
 	// The following elements throw uncatchable exceptions if you
 	// attempt to add expando properties to them.

From 6ffa730721a8ebcd128f3dc202706e46d9cfe249 Mon Sep 17 00:00:00 2001
From: jrburke <jrburke@gmail.com>
Date: Mon, 27 Dec 2010 13:01:20 -0600
Subject: [PATCH 036/110] Register as a CommonJS async module if in that kind
 of environment. Fixes #7102.

---
 src/core.js           |  5 +++++
 test/data/testinit.js |  7 ++++++-
 test/unit/core.js     | 46 ++++++++++++++++++++++---------------------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/core.js b/src/core.js
index 346e52d70..e75c86fab 100644
--- a/src/core.js
+++ b/src/core.js
@@ -886,6 +886,11 @@ function doScrollCheck() {
 	jQuery.ready();
 }
 
+// Expose jQuery as an Asynchronous Module
+if ( typeof define !== "undefined" ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
 // Expose jQuery to the global object
 return (window.jQuery = window.$ = jQuery);
 
diff --git a/test/data/testinit.js b/test/data/testinit.js
index a66f71d25..8f431fb5e 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -1,7 +1,12 @@
 var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
 	$ = this.$ || "$",
 	originaljQuery = jQuery,
-	original$ = $;
+	original$ = $,
+	commonJSDefined;
+
+function define(module, dependencies, callback) {
+	commonJSDefined = callback();
+}
 
 /**
  * Returns an array of elements with the given IDs, eg.
diff --git a/test/unit/core.js b/test/unit/core.js
index 705778370..5c80569ca 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,7 +12,9 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(23);
+	expect(24);
+
+	strictEqual( commonJSDefined, jQuery, "CommonJS registered (Bug #7102)" );
 
 	// Basic constructor's behavior
 
@@ -151,7 +153,7 @@ test("selector state", function() {
 	test = jQuery("#main").eq(0);
 	equals( test.selector, "#main.slice(0,1)", "#main eq Selector" );
 	equals( test.context, document, "#main eq Context" );
-	
+
 	var d = "<div />";
 	equals(
 		jQuery(d).appendTo(jQuery(d)).selector,
@@ -253,38 +255,38 @@ test("isPlainObject", function() {
 
 	// The use case that we want to match
 	ok(jQuery.isPlainObject({}), "{}");
-	
+
 	// Not objects shouldn't be matched
 	ok(!jQuery.isPlainObject(""), "string");
 	ok(!jQuery.isPlainObject(0) && !jQuery.isPlainObject(1), "number");
 	ok(!jQuery.isPlainObject(true) && !jQuery.isPlainObject(false), "boolean");
 	ok(!jQuery.isPlainObject(null), "null");
 	ok(!jQuery.isPlainObject(undefined), "undefined");
-	
+
 	// Arrays shouldn't be matched
 	ok(!jQuery.isPlainObject([]), "array");
- 
+
 	// Instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new Date), "new Date");
- 
+
 	var fn = function(){};
- 
+
 	// Functions shouldn't be matched
 	ok(!jQuery.isPlainObject(fn), "fn");
- 
+
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn (no methods)");
- 
+
 	// Makes the function a little more realistic
 	// (and harder to detect, incidentally)
 	fn.prototype = {someMethod: function(){}};
- 
+
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn");
 
 	// DOM Element
 	ok(!jQuery.isPlainObject(document.createElement("div")), "DOM Element");
-	
+
 	// Window
 	ok(!jQuery.isPlainObject(window), "window");
 
@@ -298,7 +300,7 @@ test("isPlainObject", function() {
 			document.body.removeChild( iframe );
 			start();
 		};
- 
+
 		var doc = iframe.contentDocument || iframe.contentWindow.document;
 		doc.open();
 		doc.write("<body onload='window.parent.iframeDone(Object);'>");
@@ -659,7 +661,7 @@ test("jQuery.merge()", function() {
 
 	// Fixed at [5998], #3641
 	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
-	
+
 	// After fixing #5527
 	same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values");
 	same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like");
@@ -694,7 +696,7 @@ test("jQuery.extend(Object, Object)", function() {
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
 	ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" );
-	
+
 	// #5991
 	ok( jQuery.isArray( jQuery.extend(true, { arr: {} }, nestedarray).arr ), "Cloned array heve to be an Array" );
 	ok( jQuery.isPlainObject( jQuery.extend(true, { arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
@@ -715,13 +717,13 @@ test("jQuery.extend(Object, Object)", function() {
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
-	
+
 	// Makes the class a little more realistic
 	myKlass.prototype = { someMethod: function(){} };
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" );
-	
+
 	var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
 	ok( ret.foo == 5, "Wrapped numbers copy correctly" );
 
@@ -849,10 +851,10 @@ test("jQuery.makeArray", function(){
 
 test("jQuery.isEmptyObject", function(){
 	expect(2);
-	
+
 	equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
 	equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );
-	
+
 	// What about this ?
 	// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
 });
@@ -878,23 +880,23 @@ test("jQuery.proxy", function(){
 
 test("jQuery.parseJSON", function(){
 	expect(8);
-	
+
 	equals( jQuery.parseJSON(), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( null ), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." );
-	
+
 	same( jQuery.parseJSON("{}"), {}, "Plain object parsing." );
 	same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." );
 
 	same( jQuery.parseJSON('\n{"test":1}'), {"test":1}, "Make sure leading whitespaces are handled." );
-	
+
 	try {
 		jQuery.parseJSON("{a:1}");
 		ok( false, "Test malformed JSON string." );
 	} catch( e ) {
 		ok( true, "Test malformed JSON string." );
 	}
-	
+
 	try {
 		jQuery.parseJSON("{'a':1}");
 		ok( false, "Test malformed JSON string." );

From 64ee5581afd6e9667ad45e75f082c95e2725efa6 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Mon, 27 Dec 2010 13:30:05 -0600
Subject: [PATCH 037/110] When a native browser event is bubbling up the DOM,
 make sure that the correct isDefaultPrevented value is reflected by jQuery's
 Event object. Fixes #7793.

---
 src/event.js       |  6 ++++++
 test/unit/event.js | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/event.js b/src/event.js
index fd470e718..c90473485 100644
--- a/src/event.js
+++ b/src/event.js
@@ -600,6 +600,12 @@ jQuery.Event = function( src ) {
 	if ( src && src.type ) {
 		this.originalEvent = src;
 		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
 	// Event type
 	} else {
 		this.type = src;
diff --git a/test/unit/event.js b/test/unit/event.js
index a647e5f3b..83f6096d7 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -295,6 +295,41 @@ test("live/delegate immediate propagation", function() {
 	$p.undelegate( "click" );
 });
 
+test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
+	expect(2);
+	var $anchor2 = jQuery( "#anchor2" ),
+		$main = jQuery( "#main" ),
+		fakeClick = function($jq) {
+			// Use a native click so we don't get jQuery simulated bubbling
+			if ( document.createEvent ) {
+				var e = document.createEvent( "MouseEvents" );
+				e.initEvent( "click", true, true ); 
+				$jq[0].dispatchEvent(e);
+			}
+			else if ( $jq[0].click ) {
+				$jq[0].click();	// IE
+			}
+		};
+	$anchor2.click(function(e) {
+		e.preventDefault();
+	});
+	$main.delegate("#foo", "click", function(e) {
+		equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" );
+	});
+	fakeClick( $anchor2 );
+	$anchor2.unbind( "click" );
+	$main.undelegate( "click" );
+	$anchor2.click(function(e) {
+		// Let the default action occur
+	});
+	$main.delegate("#foo", "click", function(e) {
+		equals( e.isDefaultPrevented(), false, "isDefaultPrevented false passed to bubbled event" );
+	});
+	fakeClick( $anchor2 );
+	$anchor2.unbind( "click" );
+	$main.undelegate( "click" );
+});
+
 test("bind(), iframes", function() {
 	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
 	var doc = jQuery("#loadediframe").contents();

From 5fd21fc02bda43d4e31bcf2d5b55b918a9190a7f Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Mon, 27 Dec 2010 13:43:52 -0600
Subject: [PATCH 038/110] Don't cache non-html strings in buildFragment to
 avoid possible collision with the names of Object methods like toString. Also
 makes the unit tests 0.5% to 8% faster. Fixes #6779.

---
 src/manipulation.js       |  4 ++--
 test/unit/manipulation.js | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/manipulation.js b/src/manipulation.js
index 5f4b15dd9..96caa02d0 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -440,12 +440,12 @@ jQuery.buildFragment = function( args, nodes, scripts ) {
 	var fragment, cacheable, cacheresults,
 		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
 
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
 	// Cloning options loses the selected state, so don't cache them
 	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
 	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
 	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
 
 		cacheable = true;
 		cacheresults = jQuery.fragments[ args[0] ];
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index da1635400..e273cf08a 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -1247,3 +1247,20 @@ test("jQuery.cleanData", function() {
 		return div;
 	}
 });
+
+test("jQuery.buildFragment - no plain-text caching (Bug #6779)", function() {
+	expect(1);
+
+	// DOM manipulation fails if added text matches an Object method
+	var $f = jQuery( "<div />" ).appendTo( "#main" ),
+		bad = [ "start-", "toString", "hasOwnProperty", "append", "here&there!", "-end" ];
+
+	for ( var i=0; i < bad.length; i++ ) {
+		try {
+			$f.append( bad[i] );
+		}
+		catch(e) {}
+	}
+    equals($f.text(), bad.join(''), "Cached strings that match Object properties");
+	$f.remove();
+});

From 8c9d32723a8943d4595eb5e04be8f891a8ff7a7f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 02:30:51 +0100
Subject: [PATCH 039/110] Renamed several ajaxSettings options. Removed cors
 test, fixed failing cors test.

---
 src/ajax.js              | 22 +++++++--------
 src/transports/jsonp.js  |  2 +-
 src/transports/script.js |  4 +--
 test/unit/ajax.js        | 58 +++++++++-------------------------------
 4 files changed, 27 insertions(+), 59 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 6cb2a626d..40524fb47 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -183,7 +183,7 @@ jQuery.extend({
 			"*": "*/*"
 		},
 
-		autoDataType: {
+		contents: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
@@ -208,7 +208,7 @@ jQuery.extend({
 		// List of data converters
 		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
-		dataConverters: {
+		converters: {
 
 			// Convert anything to text
 			"* text": window.String,
@@ -398,7 +398,7 @@ jQuery.extend({
 							oneConv,
 							convertion,
 							dataTypes = s.dataTypes,
-							dataConverters = s.dataConverters,
+							converters = s.converters,
 							responses = {
 								"xml": "XML",
 								"text": "Text"
@@ -420,14 +420,14 @@ jQuery.extend({
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
 									oneConv = conv1 = 
-										dataConverters[ ( conversion = prev + " " + current ) ] ||
-										dataConverters[ "* " + current ];
+										converters[ ( conversion = prev + " " + current ) ] ||
+										converters[ "* " + current ];
 									
 									if ( oneConv !== true ) {
 										
 										if ( ! oneConv && prev !== "text" && current !== "text" ) {
-											conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-											conv2 = dataConverters[ "text " + current ];
+											conv1 = converters[ prev + " text" ] || converters[ "* text" ];
+											conv2 = converters[ "text " + current ];
 										}
 										
 										if ( oneConv || conv1 && conv2 ) {
@@ -841,7 +841,7 @@ jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
 // (for those transports that can give text or xml responses)
 function determineDataType( s , ct , text , xml ) {
 	
-	var autoDataType = s.autoDataType,
+	var contents = s.contents,
 		type,
 		regexp,
 		dataTypes = s.dataTypes,
@@ -851,8 +851,8 @@ function determineDataType( s , ct , text , xml ) {
 	// Auto (xml, json, script or text determined given headers)
 	if ( transportDataType === "*" ) {
 
-		for ( type in autoDataType ) {
-			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
+		for ( type in contents ) {
+			if ( ( regexp = contents[ type ] ) && regexp.test( ct ) ) {
 				transportDataType = dataTypes[0] = type;
 				break;
 			}
@@ -871,7 +871,7 @@ function determineDataType( s , ct , text , xml ) {
 		
 		response = text;
 		
-		// If it's not really text, defer to dataConverters
+		// If it's not really text, defer to converters
 		if ( transportDataType !== "text" ) {
 			dataTypes.unshift( "text" );
 		}
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index f16b394ba..aa30b5dda 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -70,7 +70,7 @@ jQuery.ajax.prefilter("json jsonp", function(s) {
 		}, s.complete ];
 				
 		// Use data converter to retrieve json after script execution
-		s.dataConverters["script json"] = function() {
+		s.converters["script json"] = function() {
 			if ( ! responseContainer ) {
 				jQuery.error( jsonpCallback + " was not called" );
 			}
diff --git a/src/transports/script.js b/src/transports/script.js
index 06b4b7723..57a896d75 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -7,11 +7,11 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 		script: "text/javascript, application/javascript"
 	},
 	
-	autoDataType: {
+	contents: {
 		script: /javascript/
 	},
 		
-	dataConverters: {
+	converters: {
 		"text script": jQuery.globalEval
 	}
 } );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 85430eb82..d609c0239 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -70,44 +70,6 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
 	}, 13);
 });
 
-test("jQuery.ajax() - success/error callbacks (remote)", function() {
-	
-	var supports = jQuery.support.cors;
-	
-	expect( supports ? 9 : 4 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	setTimeout(function(){
-		jQuery('#foo').ajaxStart(function(){
-			ok( true, "ajaxStart" );
-		}).ajaxStop(function(){
-			ok( true, "ajaxStop" );
-			start();
-		}).ajaxSend(function(){
-			ok( supports , "ajaxSend" );
-		}).ajaxComplete(function(){
-			ok( true, "ajaxComplete" );
-		}).ajaxError(function(){
-			ok( ! supports, "ajaxError" );
-		}).ajaxSuccess(function(){
-			ok( supports, "ajaxSuccess" );
-		});
-
-		jQuery.ajax({
-			// JULIAN TODO:	Get an url especially for jQuery
-			url: "http://rockstarapps.com/test.php",
-			dataType: "text",
-			beforeSend: function(){ ok(supports, "beforeSend"); },
-			success: function( val ){ ok(supports, "success"); ok(supports && val.length, "data received"); },
-			error: function(_ , a , b ){ ok(false, "error"); },
-			complete: function(){ ok(supports, "complete"); }
-		});
-	}, 13);
-});
-
 test("jQuery.ajax() - success callbacks (late binding)", function() {
 	expect( 8 );
 
@@ -1328,12 +1290,12 @@ test("jQuery.ajax() - json by content-type disabled with options", function() {
 	jQuery.ajax({
 		url: url("data/json.php"),
 		data: { header: "json", json: "array" },
-		autoDataType: {
+		contents: {
 			json: false
 		},
 		success: function( text ) {
 			equals( typeof text , "string" , "json wasn't auto-determined" );
-			var json = this.dataConverters["text json"]( text );
+			var json = jQuery.parseJSON( text );
 	  		ok( json.length >= 2, "Check length");
 	  		equals( json[0].name, 'John', 'Check JSON: first, name' );
 	  		equals( json[0].age, 21, 'Check JSON: first, age' );
@@ -1677,19 +1639,25 @@ test("jQuery ajax - failing cross-domain", function() {
 	
 	var i = 2;
 	
-	jQuery.ajax({
-		url: 'http://somewebsitethatdoesnotexist.com',
+	if ( jQuery.ajax({
+		url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	});
+	}) === false ) {
+		ok( true , "no transport" );
+		if ( ! --i ) start();
+	}
 	
-	jQuery.ajax({
+	if ( jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	});
+	}) === false ) {
+		ok( true , "no transport" );
+		if ( ! --i ) start();
+	}
 	
 });
 

From 54d965ffa50fcc308721d370f952251d3da3e017 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 04:13:44 +0100
Subject: [PATCH 040/110] Introduced a new promise method on deferreds that
 returns an immutable object (exposing then, fail, isResolved, isRejected and
 promise itself only). Remove $.isDeferred and moved logic directly into
 $.when. Made sure $.when returns a promise by using promise(). Used promise()
 in ajax code too.

---
 src/ajax.js       |  7 +++---
 src/core.js       | 30 ++++++++++++------------
 test/unit/core.js | 58 ++++++++++++++++++++++-------------------------
 3 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 40524fb47..8c02f2b74 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -489,9 +489,10 @@ jQuery.extend({
 			}
 		}
 		
-		// Attach deferreds	
-		jXHR.success = jXHR.then = deferred.then;
-		jXHR.error = jXHR.fail = deferred.fail;
+		// Attach deferreds
+		deferred.promise( jXHR );
+		jXHR.success = jXHR.then;
+		jXHR.error = jXHR.fail;
 		jXHR.complete = completeDeferred.then;
 
 		// Remove hash character (#7531: and string promotion)
diff --git a/src/core.js b/src/core.js
index eb0c1c8a7..07666d928 100644
--- a/src/core.js
+++ b/src/core.js
@@ -78,7 +78,7 @@ var jQuery = function( selector, context ) {
 	class2type = {},
 	
 	// Marker for deferred
-	deferredMarker = [];
+	promiseMarker = [];
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -896,9 +896,6 @@ jQuery.extend({
 				}
 			};
 		
-		// Add the deferred marker
-		deferred.then._ = deferredMarker;
-		
 		return deferred;
 	},
 	
@@ -916,7 +913,16 @@ jQuery.extend({
 				fail: errorDeferred.then,
 				fireReject: errorDeferred.fire,
 				reject: errorDeferred.resolve,
-				isRejected: errorDeferred.isResolved
+				isRejected: errorDeferred.isResolved,
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					obj = obj || {};
+					for ( var i in { then:1 , fail:1 , isResolved:1 , isRejected:1 , promise:1 } ) {
+						obj[ i ] = deferred[ i ];
+					}
+					return obj;
+				}
 
 		} );
 		
@@ -924,6 +930,9 @@ jQuery.extend({
 		delete deferred.cancel;
 		delete deferred.isCancelled;
 		
+		// Add promise marker
+		deferred.promise._ = promiseMarker;
+		
 		// Make sure only one callback list will be used
 		deferred.then( errorDeferred.cancel ).fail( successCancel );
 		
@@ -935,17 +944,12 @@ jQuery.extend({
 		return deferred;
 	},
 
-	// Check if an object is a deferred
-	isDeferred: function( object ) {
-		return !!( object && object.then && object.then._ === deferredMarker );
-	},
-	
 	// Deferred helper
 	when: function( object ) {
-		object = jQuery.isDeferred( object ) ?
+		object = object && object.promise && object.promise._ === promiseMarker ?
 			object :
 			jQuery.Deferred().resolve( object );
-		return object;
+		return object.promise();
 	},
 
 	// Use of jQuery.browser is frowned upon.
@@ -966,9 +970,7 @@ jQuery.extend({
 });
 
 // Create readyList deferred
-// also force $.fn.ready to be recognized as a defer
 readyList = jQuery._Deferred();
-jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
 jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
diff --git a/test/unit/core.js b/test/unit/core.js
index e0938b68a..1cd41a675 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1022,42 +1022,38 @@ test("jQuery.Deferred()", function() {
 	});
 });
 	
-test("jQuery.isDeferred()", function() {
-	
-	expect( 10 );
-	
-	var object1 = { then: function() { return this; } },
-		object2 = { then: function() { return this; } };
-		
-	object2.then._ = [];
-	
-	// The use case that we want to match
-	ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
-	ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");
-	
-	// Some other objects
-	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
-	ok(!jQuery.isDeferred(object2), "Object with then & marker");
-	
-	// Not objects shouldn't be matched
-	ok(!jQuery.isDeferred(""), "string");
-	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
-	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
-	ok(!jQuery.isDeferred(null), "null");
-	ok(!jQuery.isDeferred(undefined), "undefined");
-	
-	object1 = {custom: jQuery._Deferred().then};
-	
-	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
-});
-
 test("jQuery.when()", function() {
 	
-	expect( 2 );
+	expect( 14 );
+	
+	var fakeDeferred = { then: function() { return this; } };
+		
+	fakeDeferred.then._ = [];
+	
+	// Some other objects
+	jQuery.each( {
+		
+		"Object with then & no marker": { then: jQuery.noop },
+		"Object with then & marker": fakeDeferred,
+		"string 1/2": "",
+		"string 2/2": "some string",
+		"number 1/2": 0,
+		"number 2/2": 1,
+		"boolean 1/2": true,
+		"boolean 2/2": false,
+		"null": null,
+		"undefined": undefined,
+		"custom method name not found automagically": {custom: jQuery._Deferred().then}
+	
+	} , function( message , value ) {
+		
+		notStrictEqual( jQuery.when( value ) , value , message );
+		
+	} );
 	
 	var cache, i;
 	
-	for( i = 1 ; i < 3 ; i++ ) {
+	for( i = 1 ; i < 4 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );
 		}) ).then( function( value ) {

From 7490eb4f8e1930ca370eec21b4d5469f87b65db6 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 29 Dec 2010 18:44:45 +0100
Subject: [PATCH 041/110] Revised conversion logic to handle converter equal to
 true properly.

---
 src/ajax.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 8c02f2b74..46e5a14e7 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -393,9 +393,9 @@ jQuery.extend({
 							current,
 							prev,
 							checker,
+							conv,
 							conv1,
 							conv2,
-							oneConv,
 							convertion,
 							dataTypes = s.dataTypes,
 							converters = s.converters,
@@ -419,23 +419,28 @@ jQuery.extend({
 								
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
-									oneConv = conv1 = 
-										converters[ ( conversion = prev + " " + current ) ] ||
+									conv = converters[ ( conversion = prev + " " + current ) ] ||
 										converters[ "* " + current ];
 									
-									if ( oneConv !== true ) {
-										
-										if ( ! oneConv && prev !== "text" && current !== "text" ) {
-											conv1 = converters[ prev + " text" ] || converters[ "* text" ];
-											conv2 = converters[ "text " + current ];
-										}
-										
-										if ( oneConv || conv1 && conv2 ) {
-											response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-										} else {
-											throw "no " + conversion;
+									conv1 = conv2 = 0;
+									
+									if ( ! conv && prev !== "text" && current !== "text" ) {
+										conv1 = converters[ prev + " text" ] || converters[ "* text" ];
+										conv2 = converters[ "text " + current ];
+										if ( conv1 === true ) {
+											conv = conv2;
+										} else if ( conv2 === true ) {
+											conv = conv1;
 										}
 									}
+									
+									if ( ! ( conv || conv1 && conv2 ) ) {
+										throw conversion;
+									}
+									
+									if ( conv !== true ) {
+										response = conv ? conv( response ) : conv2( conv1( response ) );
+									}
 								}
 							} else if ( s.dataFilter ) {
 								

From dfa57073069c6b60f623635df65e02c0c0c9a582 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 30 Dec 2010 04:41:52 +0100
Subject: [PATCH 042/110] Fix for #7865. Scripts onload handler passes event as
 first parameter so statusText is now passed as second argument for aborts.

---
 src/transports/script.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/transports/script.js b/src/transports/script.js
index fe3873557..7416a2d1a 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -47,10 +47,9 @@ jQuery.xhr.bindTransport("script", function(s) {
 				script.src = s.url;
 				
 				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function(statusText) {
+				script.onload = script.onreadystatechange = function( _ , statusText) {
 					
-					if ( (!script.readyState ||
-							script.readyState === "loaded" || script.readyState === "complete") ) {
+					if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) {
 								
 						// Handle memory leak in IE
 						script.onload = script.onreadystatechange = null;
@@ -60,10 +59,10 @@ jQuery.xhr.bindTransport("script", function(s) {
 							head.removeChild( script );
 						}
 						
-						script = undefined;
+						script = 0;
 						
-						// Callback & dereference
-						callback(statusText ? 0 : 200, statusText || "success");
+						// Callback
+						callback( statusText ? 0 : 200, statusText || "success" );
 					}
 				};
 				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
@@ -73,7 +72,7 @@ jQuery.xhr.bindTransport("script", function(s) {
 			
 			abort: function(statusText) {
 				if ( script ) {
-					script.onload(statusText);
+					script.onload( 0 , statusText );
 				}
 			}
 		};

From 9029dc02a234ad9699513f81acd1423f9c2c4e30 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 29 Dec 2010 23:58:03 -0600
Subject: [PATCH 043/110] Update CommonJS module registration to check to see
 if define is a function instead of just not undefined.

---
 src/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core.js b/src/core.js
index e75c86fab..4da1212c1 100644
--- a/src/core.js
+++ b/src/core.js
@@ -887,7 +887,7 @@ function doScrollCheck() {
 }
 
 // Expose jQuery as an Asynchronous Module
-if ( typeof define !== "undefined" ) {
+if ( typeof define === "function" ) {
 	define( "jquery", [], function () { return jQuery; } );
 }
 

From 3e0cc815043c2425819743e907a0ce263a7ce164 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Thu, 30 Dec 2010 00:34:48 -0600
Subject: [PATCH 044/110] Clean trailing whitespace from all files.

---
 Makefile                  |   2 +-
 Rakefile                  |  22 +-
 build.xml                 |   2 +-
 src/ajax.js               |  48 ++---
 src/attributes.js         |   2 +-
 src/core.js               |  56 ++---
 src/dimensions.js         |   2 +-
 src/effects.js            |   2 +-
 src/intro.js              |   2 +-
 src/offset.js             |  10 +-
 src/traversing.js         |  14 +-
 src/xhr.js                | 426 +++++++++++++++++++-------------------
 test/data/headers.php     |  12 +-
 test/data/params_html.php |   6 +-
 test/delegatetest.html    |   6 +-
 test/polluted.php         |   4 +-
 test/unit/ajax.js         | 108 +++++-----
 test/unit/attributes.js   |  66 +++---
 test/unit/css.js          |  64 +++---
 test/unit/dimensions.js   |  30 +--
 test/unit/effects.js      |  26 +--
 test/unit/event.js        | 258 +++++++++++------------
 test/unit/offset.js       | 100 ++++-----
 test/unit/queue.js        |  46 ++--
 test/unit/selector.js     |  38 ++--
 test/unit/traversing.js   |  24 +--
 26 files changed, 688 insertions(+), 688 deletions(-)

diff --git a/Makefile b/Makefile
index 935f69c12..6f2281754 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ ${JQ}: ${MODULES} ${DIST_DIR}
 	@@cat ${MODULES} | \
 		sed 's/.function..jQuery...{//' | \
 		sed 's/}...jQuery..;//' | \
-		sed 's/Date:./&'"${DATE}"'/' | \
+		sed 's/@DATE/'"${DATE}"'/' | \
 		${VER} > ${JQ};
 
 ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
diff --git a/Rakefile b/Rakefile
index 5ea143b66..4319aa769 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,7 +31,7 @@ rhino      = "java -jar #{build_dir}/js.jar"
 minfier    = "java -jar #{build_dir}/google-compiler-20100917.jar"
 
 # Turn off output other than needed from `sh` and file commands
-verbose(false) 
+verbose(false)
 
 # Tasks
 task :default => "all"
@@ -51,7 +51,7 @@ task :min => jq_min
 task :init => [sizzle, qunit] do
   sizzle_git = File.join(sizzle_dir, '.git')
   qunit_git  = File.join(qunit_dir,  '.git')
-  
+
   puts "Updating SizzleJS with latest..."
 	sh "git --git-dir=#{sizzle_git} pull -q origin master"
 
@@ -61,7 +61,7 @@ end
 
 desc "Removes dist folder, selector.js, and Sizzle/QUnit"
 task :clean do
-  puts "Removing Distribution directory: #{dist_dir}..." 
+  puts "Removing Distribution directory: #{dist_dir}..."
   rm_rf dist_dir
 
   puts "Removing built copy of Sizzle..."
@@ -87,9 +87,9 @@ directory dist_dir
 
 file jq => [dist_dir, base_files].flatten do
   puts "Building jquery.js..."
-  
+
   File.open(jq, 'w') do |f|
-    f.write cat(base_files).gsub(/(Date:.)/, "\\1#{date}" ).gsub(/@VERSION/, version)
+    f.write cat(base_files).gsub(/@DATE/, date).gsub(/@VERSION/, version)
   end
 end
 
@@ -97,9 +97,9 @@ file jq_min => jq do
   puts "Building jquery.min.js..."
 
   sh "#{minfier} --js #{jq} --warning_level QUIET --js_output_file #{jq_min}"
-  
+
   min = File.read( jq_min )
-  
+
   # Equivilent of "head"
   File.open(jq_min, 'w') do |f|
     f.write File.readlines(jq)[0..14].join()
@@ -107,12 +107,12 @@ file jq_min => jq do
   end
 end
 
-file selector => [sizzle, :init] do 
+file selector => [sizzle, :init] do
   puts "Building selector code from Sizzle..."
-  
+
   File.open(selector, 'w') do |f|
-    f.write File.read(sizzle).gsub( 
-      /^.+EXPOSE$\n/, 
+    f.write File.read(sizzle).gsub(
+      /^.+EXPOSE$\n/,
       '\0' + File.read( File.join( src_dir, 'sizzle-jquery.js' ))
     ).gsub(
       /^window.Sizzle.+$\n/, ''
diff --git a/build.xml b/build.xml
index f6650f440..6a28aa849 100644
--- a/build.xml
+++ b/build.xml
@@ -77,7 +77,7 @@
 			<arg line="log -1 --pretty=format:%ad" />
 		</exec>
 		<replaceregexp match="(\(\s*function\s*\(\s*jQuery\s*\)\s*\{)|(\}\s*\)\s*\(\s*jQuery\s*\)\s*;)" flags="g" replace="" file="${JQ}" />
-		<replaceregexp match="Date: " replace="Date: ${date}" file="${JQ}" />
+		<replaceregexp match="@DATE" replace="${date}" file="${JQ}" />
 		<echo message="${JQ} built." />
 	</target>
 
diff --git a/src/ajax.js b/src/ajax.js
index 18ea203d0..08fbe6f01 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,5 +1,5 @@
 (function( jQuery ) {
-	
+
 var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
 	rselectTextarea = /^(?:select|textarea)/i,
 	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
@@ -43,9 +43,9 @@ jQuery.fn.extend({
 				type = "POST";
 			}
 		}
-		
+
 		var self = this;
-		
+
 		// Request the remote document
 		jQuery.ajax({
 			url: url,
@@ -171,7 +171,7 @@ jQuery.extend({
 			text: "Text",
 			json: "JSON"
 		},
-			
+
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -179,13 +179,13 @@ jQuery.extend({
 			json: "application/json, text/javascript",
 			"*": "*/*"
 		},
-		
+
 		autoDataType: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
 		},
-		
+
 		// Prefilters
 		// 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
 		// 2) These are called:
@@ -193,27 +193,27 @@ jQuery.extend({
 		//    * AFTER param serialization (s.data is a string if s.processData is true)
 		// 3) They MUST be order agnostic
 		prefilters: [],
-		
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {
 		},
-		
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
 		// 3) error throws is used as error data
 		dataCheckers: {
-	
+
 			// Check if data is a string
 			"text": function(data) {
 				if ( typeof data != "string" ) {
 					jQuery.error("typeerror");
 				}
 			},
-	
+
 			// Check if xml has been properly parsed
 			"xml": function(data) {
 				var documentElement = data ? data.documentElement : data;
@@ -225,25 +225,25 @@ jQuery.extend({
 				}
 			}
 		},
-		
+
 		// List of data converters
 		// 1) key format is "source_type => destination_type" (spaces required)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
-		
+
 			// Convert anything to text
 			"* => text": function(data) {
 				return "" + data;
 			},
-			
+
 			// Text to html (no transformation)
 			"text => html": function(data) {
 				return data;
 			},
-			
+
 			// Evaluate text as a json expression
 			"text => json": jQuery.parseJSON,
-			
+
 			// Parse text as xml
 			"text => xml": function(data) {
 				var xml, parser;
@@ -262,14 +262,14 @@ jQuery.extend({
 
 	// Main method
 	ajax: function( url , s ) {
-		
+
 		if ( arguments.length === 1 ) {
 			s = url;
 			url = s ? s.url : undefined;
 		}
-		
+
 		return jQuery.xhr().open( s ? s.type : undefined , url ).send( undefined , s );
-		
+
 	},
 
 	// Serialize an array of form elements or a set of
@@ -281,19 +281,19 @@ jQuery.extend({
 				value = jQuery.isFunction(value) ? value() : value;
 				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
 			};
-		
+
 		// Set traditional to true for jQuery <= 1.3.2 behavior.
 		if ( traditional === undefined ) {
 			traditional = jQuery.ajaxSettings.traditional;
 		}
-		
+
 		// If an array was passed in, assume that it is an array of form elements.
 		if ( jQuery.isArray(a) || a.jquery ) {
 			// Serialize the form elements
 			jQuery.each( a, function() {
 				add( this.name, this.value );
 			});
-			
+
 		} else {
 			// If traditional, encode the "old" way (the way 1.3.2 or older
 			// did it), otherwise encode params recursively.
@@ -326,7 +326,7 @@ function buildParams( prefix, obj, traditional, add ) {
 				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
 			}
 		});
-			
+
 	} else if ( !traditional && obj != null && typeof obj === "object" ) {
 		// If we see an array here, it is empty and should be treated as an empty
 		// object
@@ -339,7 +339,7 @@ function buildParams( prefix, obj, traditional, add ) {
 				buildParams( prefix + "[" + k + "]", v, traditional, add );
 			});
 		}
-					
+
 	} else {
 		// Serialize scalar item.
 		add( prefix, obj );
@@ -373,7 +373,7 @@ if ( window.ActiveXObject ) {
 			return new window.XMLHttpRequest();
 		} catch( xhrError ) {}
 	}
-	
+
 	try {
 		return new window.ActiveXObject("Microsoft.XMLHTTP");
 	} catch( activeError ) {}
diff --git a/src/attributes.js b/src/attributes.js
index 78b1bfd20..fec132340 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -182,7 +182,7 @@ jQuery.fn.extend({
 						var option = options[ i ];
 
 						// Don't return options that are disabled or in a disabled optgroup
-						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
 								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
 
 							// Get the specific value for the option
diff --git a/src/core.js b/src/core.js
index 4da1212c1..e463ade01 100644
--- a/src/core.js
+++ b/src/core.js
@@ -56,10 +56,10 @@ var jQuery = function( selector, context ) {
 
 	// For matching the engine and version of the browser
 	browserMatch,
-	
+
 	// Has the ready events already been bound?
 	readyBound = false,
-	
+
 	// The functions to execute on DOM ready
 	readyList = [],
 
@@ -73,7 +73,7 @@ var jQuery = function( selector, context ) {
 	slice = Array.prototype.slice,
 	trim = String.prototype.trim,
 	indexOf = Array.prototype.indexOf,
-	
+
 	// [[Class]] -> type pairs
 	class2type = {};
 
@@ -92,7 +92,7 @@ jQuery.fn = jQuery.prototype = {
 			this.length = 1;
 			return this;
 		}
-		
+
 		// The body element only exists once, optimize finding it
 		if ( selector === "body" && !context && document.body ) {
 			this.context = document;
@@ -131,9 +131,9 @@ jQuery.fn = jQuery.prototype = {
 						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
 						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
 					}
-					
+
 					return jQuery.merge( this, selector );
-					
+
 				// HANDLE: $("#id")
 				} else {
 					elem = document.getElementById( match[2] );
@@ -226,7 +226,7 @@ jQuery.fn = jQuery.prototype = {
 
 		if ( jQuery.isArray( elems ) ) {
 			push.apply( ret, elems );
-		
+
 		} else {
 			jQuery.merge( ret, elems );
 		}
@@ -252,7 +252,7 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-	
+
 	ready: function( fn ) {
 		// Attach the listeners
 		jQuery.bindReady();
@@ -270,7 +270,7 @@ jQuery.fn = jQuery.prototype = {
 
 		return this;
 	},
-	
+
 	eq: function( i ) {
 		return i === -1 ?
 			this.slice( i ) :
@@ -295,7 +295,7 @@ jQuery.fn = jQuery.prototype = {
 			return callback.call( elem, i, elem );
 		}));
 	},
-	
+
 	end: function() {
 		return this.prevObject || jQuery(null);
 	},
@@ -384,14 +384,14 @@ jQuery.extend({
 
 		return jQuery;
 	},
-	
+
 	// Is the DOM ready to be used? Set to true once it occurs.
 	isReady: false,
 
 	// A counter to track how many items to wait for before
 	// the ready event fires. See #6781
 	readyWait: 1,
-	
+
 	// Handle when the DOM is ready
 	ready: function( wait ) {
 		// A third-party is pushing the ready event forwards
@@ -435,7 +435,7 @@ jQuery.extend({
 			}
 		}
 	},
-	
+
 	bindReady: function() {
 		if ( readyBound ) {
 			return;
@@ -454,7 +454,7 @@ jQuery.extend({
 		if ( document.addEventListener ) {
 			// Use the handy event callback
 			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
+
 			// A fallback to window.onload, that will always work
 			window.addEventListener( "load", jQuery.ready, false );
 
@@ -463,7 +463,7 @@ jQuery.extend({
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
 			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
+
 			// A fallback to window.onload, that will always work
 			window.attachEvent( "onload", jQuery.ready );
 
@@ -514,20 +514,20 @@ jQuery.extend({
 		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
 			return false;
 		}
-		
+
 		// Not own constructor property must be Object
 		if ( obj.constructor &&
 			!hasOwn.call(obj, "constructor") &&
 			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
 			return false;
 		}
-		
+
 		// Own properties are enumerated firstly, so to speed up,
 		// if last one is own, then all properties are own.
-	
+
 		var key;
 		for ( key in obj ) {}
-		
+
 		return key === undefined || hasOwn.call( obj, key );
 	},
 
@@ -537,11 +537,11 @@ jQuery.extend({
 		}
 		return true;
 	},
-	
+
 	error: function( msg ) {
 		throw msg;
 	},
-	
+
 	parseJSON: function( data ) {
 		if ( typeof data !== "string" || !data ) {
 			return null;
@@ -549,7 +549,7 @@ jQuery.extend({
 
 		// Make sure leading/trailing whitespace is removed (IE can't handle it)
 		data = jQuery.trim( data );
-		
+
 		// Make sure the incoming data is actual JSON
 		// Logic borrowed from http://json.org/json2.js
 		if ( rvalidchars.test(data.replace(rvalidescape, "@")
@@ -691,7 +691,7 @@ jQuery.extend({
 			for ( var l = second.length; j < l; j++ ) {
 				first[ i++ ] = second[ j ];
 			}
-		
+
 		} else {
 			while ( second[j] !== undefined ) {
 				first[ i++ ] = second[ j++ ];
@@ -772,7 +772,7 @@ jQuery.extend({
 	// The value/s can be optionally by executed if its a function
 	access: function( elems, key, value, exec, fn, pass ) {
 		var length = elems.length;
-	
+
 		// Setting many attributes
 		if ( typeof key === "object" ) {
 			for ( var k in key ) {
@@ -780,19 +780,19 @@ jQuery.extend({
 			}
 			return elems;
 		}
-	
+
 		// Setting one attribute
 		if ( value !== undefined ) {
 			// Optionally, function values get executed if exec is true
 			exec = !pass && exec && jQuery.isFunction(value);
-		
+
 			for ( var i = 0; i < length; i++ ) {
 				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
 			}
-		
+
 			return elems;
 		}
-	
+
 		// Getting an attribute
 		return length ? fn( elems[0], key ) : undefined;
 	},
diff --git a/src/dimensions.js b/src/dimensions.js
index f35b0acfb..17b4f8f96 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -25,7 +25,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 		if ( !elem ) {
 			return size == null ? null : this;
 		}
-		
+
 		if ( jQuery.isFunction( size ) ) {
 			return this.each(function( i ) {
 				var self = jQuery( this );
diff --git a/src/effects.js b/src/effects.js
index 600707427..5f3a035fc 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -61,7 +61,7 @@ jQuery.fn.extend({
 		} else {
 			for ( var i = 0, j = this.length; i < j; i++ ) {
 				var display = jQuery.css( this[i], "display" );
-        
+
 				if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
 					jQuery.data( this[i], "olddisplay", display );
 				}
diff --git a/src/intro.js b/src/intro.js
index cb15705a6..a75f3112f 100644
--- a/src/intro.js
+++ b/src/intro.js
@@ -11,7 +11,7 @@
  * Copyright 2010, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: 
+ * Date: @DATE
  */
 (function( window, undefined ) {
 
diff --git a/src/offset.js b/src/offset.js
index 3fb2917b2..2040c9d83 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -7,7 +7,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 	jQuery.fn.offset = function( options ) {
 		var elem = this[0], box;
 
-		if ( options ) { 
+		if ( options ) {
 			return this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
@@ -49,7 +49,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
 
-		if ( options ) { 
+		if ( options ) {
 			return this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
@@ -168,7 +168,7 @@ jQuery.offset = {
 
 		return { top: top, left: left };
 	},
-	
+
 	setOffset: function( elem, options, i ) {
 		var position = jQuery.css( elem, "position" );
 
@@ -202,7 +202,7 @@ jQuery.offset = {
 		if (options.left != null) {
 			props.left = (options.left - curOffset.left) + curLeft;
 		}
-		
+
 		if ( "using" in options ) {
 			options.using.call( elem, props );
 		} else {
@@ -262,7 +262,7 @@ jQuery.each( ["Left", "Top"], function( i, name ) {
 
 	jQuery.fn[ method ] = function(val) {
 		var elem = this[0], win;
-		
+
 		if ( !elem ) {
 			return null;
 		}
diff --git a/src/traversing.js b/src/traversing.js
index 15446bd8b..689e90196 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -51,7 +51,7 @@ jQuery.fn.extend({
 	filter: function( selector ) {
 		return this.pushStack( winnow(this, selector, true), "filter", selector );
 	},
-	
+
 	is: function( selector ) {
 		return !!selector && jQuery.filter( selector, this ).length > 0;
 	},
@@ -69,7 +69,7 @@ jQuery.fn.extend({
 					selector = selectors[i];
 
 					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ?
 							jQuery( selector, context || this.context ) :
 							selector;
 					}
@@ -92,7 +92,7 @@ jQuery.fn.extend({
 			return ret;
 		}
 
-		var pos = POS.test( selectors ) ? 
+		var pos = POS.test( selectors ) ?
 			jQuery( selectors, context || this.context ) : null;
 
 		for ( i = 0, l = this.length; i < l; i++ ) {
@@ -113,10 +113,10 @@ jQuery.fn.extend({
 		}
 
 		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
-		
+
 		return this.pushStack( ret, "closest", selectors );
 	},
-	
+
 	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
@@ -197,7 +197,7 @@ jQuery.each({
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
 		var ret = jQuery.map( this, fn, until );
-		
+
 		if ( !runtil.test( name ) ) {
 			selector = until;
 		}
@@ -226,7 +226,7 @@ jQuery.extend({
 			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
 			jQuery.find.matches(expr, elems);
 	},
-	
+
 	dir: function( elem, dir, until ) {
 		var matched = [],
 			cur = elem[ dir ];
diff --git a/src/xhr.js b/src/xhr.js
index 4896e6cb6..c71539632 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -6,39 +6,39 @@ var rquery_xhr = /\?/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	
+
 	sliceFunc = Array.prototype.slice,
-	
+
 	isFunction = jQuery.isFunction;
-	
+
 // Creates a jQuery xhr object
 jQuery.xhr = function( _native ) {
-	
+
 	if ( _native ) {
 		return jQuery.ajaxSettings.xhr();
 	}
-	
+
 	function reset(force) {
-		
+
 		// We only need to reset if we went through the init phase
 		// (with the exception of object creation)
 		if ( force || internal ) {
-		
+
 			// Reset callbacks lists
 			callbacksLists = {
 				success: createCBList(),
 				error: createCBList(),
 				complete: createCBList()
 			};
-			
+
 			// Reset private variables
 			requestHeaders = {};
 			responseHeadersString = responseHeaders = internal = done = timeoutTimer = s = undefined;
-			
+
 			// Reset state
 			xhr.readyState = 0;
 			sendFlag = 0;
-			
+
 			// Remove responseX fields
 			for ( var name in xhr ) {
 				if ( /^response/.test(name) ) {
@@ -47,134 +47,134 @@ jQuery.xhr = function( _native ) {
 			}
 		}
 	}
-	
+
 	function init() {
-		
+
 		var // Options extraction
-		
+
 			// Remove hash character (#7531: first for string promotion)
 			url = s.url = ( "" + s.url ).replace( rhash , "" ),
-			
+
 			// Uppercase the type
 			type = s.type = s.type.toUpperCase(),
-			
+
 			// Determine if request has content
 			hasContent = s.hasContent = ! rnoContent.test( type ),
-			
+
 			// Extract dataTypes list
 			dataType = s.dataType,
 			dataTypes = s.dataTypes = dataType ? jQuery.trim(dataType).toLowerCase().split(/\s+/) : ["*"],
-			
+
 			// Determine if a cross-domain request is in order
 			parts = rurl.exec( url.toLowerCase() ),
 			loc = location,
 			crossDomain = s.crossDomain = !!( parts && ( parts[1] && parts[1] != loc.protocol || parts[2] != loc.host ) ),
-			
+
 			// Get other options locally
 			data = s.data,
 			originalContentType = s.contentType,
 			prefilters = s.prefilters,
 			accepts = s.accepts,
 			headers = s.headers,
-			
+
 			// Other Variables
 			transportDataType,
 			i;
-			
+
 		// Convert data if not already a string
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
-		
+
 		// Apply option prefilters
 		for ( i = 0; i < prefilters.length; i++ ) {
 			prefilters[i](s);
 		}
-		
+
 		// Get internal
 		internal = selectTransport( s );
-		
+
 		// Re-actualize url & data
 		url = s.url;
 		data = s.data;
-		
+
 		// If internal was found
 		if ( internal ) {
-			
+
 			// Get transportDataType
 			transportDataType = dataTypes[0];
-			
+
 			// More options handling for requests with no content
 			if ( ! hasContent ) {
-				
+
 				// If data is available, append data to url
 				if ( data ) {
 					url += (rquery_xhr.test(url) ? "&" : "?") + data;
 				}
-								
+
 				// Add anti-cache in url if needed
 				if ( s.cache === false ) {
-					
+
 					var ts = jQuery.now(),
 						// try replacing _= if it is there
 						ret = url.replace(rts, "$1_=" + ts );
-						
+
 					// if nothing was replaced, add timestamp to the end
 					url = ret + ((ret == url) ? (rquery_xhr.test(url) ? "&" : "?") + "_=" + ts : "");
 				}
-				
+
 				s.url = url;
 			}
-			
+
 			// Set the correct header, if data is being sent
 			if ( ( data && hasContent ) || originalContentType ) {
 				requestHeaders["content-type"] = s.contentType;
 			}
-		
+
 			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 			if ( s.ifModified ) {
-				if ( jQuery_lastModified[url] ) { 
+				if ( jQuery_lastModified[url] ) {
 					requestHeaders["if-modified-since"] = jQuery_lastModified[url];
 				}
 				if ( jQuery_etag[url] ) {
 					requestHeaders["if-none-match"] = jQuery_etag[url];
 				}
 			}
-		
+
 			// Set the Accepts header for the server, depending on the dataType
 			requestHeaders.accept = transportDataType && accepts[ transportDataType ] ?
 				accepts[ transportDataType ] + ( transportDataType !== "*" ? ", */*; q=0.01" : "" ) :
 				accepts[ "*" ];
-				
+
 			// Check for headers option
 			for ( i in headers ) {
 				requestHeaders[ i.toLowerCase() ] = headers[ i ];
-			}			
+			}
 		}
-			
+
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
-		
+
 		for ( i in callbacksLists ) {
 			callbacksLists[i].bind(s[i]);
 		}
-		
+
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
-		
+
 		done = whenDone;
 	}
-	
+
 	function whenDone(status, statusText, response, headers) {
-		
+
 		// Called once
 		done = undefined;
-		
+
 		// Reset sendFlag
 		sendFlag = 0;
-		
+
 		// Cache response headers
 		responseHeadersString = headers || "";
 
@@ -182,12 +182,12 @@ jQuery.xhr = function( _native ) {
 		if ( timeoutTimer ) {
 			clearTimeout(timeoutTimer);
 		}
-		
+
 		var // Reference url
 			url = s.url,
 			// and ifModified status
 			ifModified = s.ifModified,
-			
+
 			// Is it a success?
 			isSuccess = 0,
 			// Stored success
@@ -197,19 +197,19 @@ jQuery.xhr = function( _native ) {
 
 		// If not timeout, force a jQuery-compliant status text
 		if ( statusText != "timeout" ) {
-			statusText = ( status >= 200 && status < 300 ) ? 
+			statusText = ( status >= 200 && status < 300 ) ?
 				"success" :
 				( status === 304 ? "notmodified" : "error" );
 		}
-		
+
 		// If successful, handle type chaining
 		if ( statusText === "success" || statusText === "notmodified" ) {
-			
+
 			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 			if ( ifModified ) {
 				var lastModified = xhr.getResponseHeader("Last-Modified"),
 					etag = xhr.getResponseHeader("Etag");
-					
+
 				if (lastModified) {
 					jQuery_lastModified[url] = lastModified;
 				}
@@ -217,17 +217,17 @@ jQuery.xhr = function( _native ) {
 					jQuery_etag[url] = etag;
 				}
 			}
-			
+
 			if ( ifModified && statusText === "notmodified" ) {
-				
+
 				success = null;
 				isSuccess = 1;
-				
+
 			} else {
 				// Chain data conversions and determine the final value
 				// (if an exception is thrown in the process, it'll be notified as an error)
 				try {
-					
+
 					function checkData(data) {
 						if ( data !== undefined ) {
 							var testFunction = s.dataCheckers[srcDataType];
@@ -236,7 +236,7 @@ jQuery.xhr = function( _native ) {
 							}
 						}
 					}
-					
+
 					function convertData (data) {
 						var conversionFunction = dataConverters[srcDataType+" => "+destDataType] ||
 								dataConverters["* => "+destDataType],
@@ -259,11 +259,11 @@ jQuery.xhr = function( _native ) {
 							if ( noFunction ) {
 								jQuery.error( "no data converter between " + srcDataType + " and " + destDataType );
 							}
-							
+
 						}
 						return conversionFunction(data);
 					}
-					
+
 					var dataTypes = s.dataTypes,
 						i,
 						length,
@@ -272,13 +272,13 @@ jQuery.xhr = function( _native ) {
 						srcDataType,
 						destDataType,
 						responseTypes = s.xhrResponseFields;
-						
+
 					for ( i = 0, length = dataTypes.length ; i < length ; i++ ) {
-	
+
 						destDataType = dataTypes[i];
-						
+
 						if ( !srcDataType ) { // First time
-							
+
 							// Copy type
 							srcDataType = destDataType;
 							// Check
@@ -289,92 +289,92 @@ jQuery.xhr = function( _native ) {
 								// Recheck data
 								checkData(data);
 							}
-							
+
 						} else { // Subsequent times
-							
+
 							// handle auto
 							// JULIAN: for reasons unknown to me === doesn't work here
 							if (destDataType == "*") {
-	
+
 								destDataType = srcDataType;
-								
+
 							} else if ( srcDataType != destDataType ) {
-								
+
 								// Convert
 								data = convertData(data);
 								// Copy type & check
 								srcDataType = destDataType;
 								checkData(data);
-								
+
 							}
-							
+
 						}
-	
+
 						// Copy response into the xhr if it hasn't been already
 						var responseDataType,
 							responseType = responseTypes[srcDataType];
-						
+
 						if ( responseType ) {
-							
+
 							responseDataType = srcDataType;
-							
+
 						} else {
-							
+
 							responseType = responseTypes[ responseDataType = "text" ];
-							
+
 						}
-							
+
 						if ( responseType !== 1 ) {
 							xhr[ "response" + responseType ] = data;
 							responseTypes[ responseType ] = 1;
 						}
-						
+
 					}
-	
+
 					// We have a real success
 					success = data;
 					isSuccess = 1;
-					
+
 				} catch(e) {
-					
+
 					statusText = "parsererror";
 					error = "" + e;
-					
+
 				}
 			}
-			
+
 		} else { // if not success, mark it as an error
-			
+
 				error = error || statusText;
-				
+
 		}
-			
+
 		// Set data for the fake xhr object
 		xhr.status = status;
 		xhr.statusText = statusText;
-		
+
 		// Keep local copies of vars in case callbacks re-use the xhr
 		var _s = s,
 			_callbacksLists = callbacksLists,
 			_callbackContext = callbackContext,
 			_globalEventContext = globalEventContext;
-			
+
 		// Set state if the xhr hasn't been re-used
 		function _setState( value ) {
 			if ( xhr.readyState && s === _s ) {
 				setState( value );
 			}
 		}
-				
+
 		// Really completed?
 		if ( status && s.async ) {
 			setState( 2 );
 			_setState( 3 );
 		}
-		
+
 		// We're done
 		_setState( 4 );
-		
+
 		// Success
 		_callbacksLists.success.fire( isSuccess , _callbackContext , success, statusText, xhr);
 		if ( isSuccess && _s.global ) {
@@ -383,7 +383,7 @@ jQuery.xhr = function( _native ) {
 		// Error
 		_callbacksLists.error.fire( ! isSuccess , _callbackContext , xhr, statusText, error);
 		if ( !isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxError", [xhr, _s, error] );	
+			_globalEventContext.trigger( "ajaxError", [xhr, _s, error] );
 		}
 		// Complete
 		_callbacksLists.complete.fire( 1 , _callbackContext, xhr, statusText);
@@ -395,14 +395,14 @@ jQuery.xhr = function( _native ) {
 			}
 		}
 	}
-	
+
 	// Ready state control
 	function checkState( expected , test ) {
 		if ( expected !== true && ( expected === false || test === false || xhr.readyState !== expected ) ) {
 			jQuery.error("INVALID_STATE_ERR");
 		}
 	}
-	
+
 	// Ready state change
 	function setState( value ) {
 		xhr.readyState = value;
@@ -410,7 +410,7 @@ jQuery.xhr = function( _native ) {
 			xhr.onreadystatechange();
 		}
 	}
-	
+
 	var // jQuery lists
 		jQuery_lastModified = jQuery.lastModified,
 		jQuery_etag = jQuery.etag,
@@ -437,16 +437,16 @@ jQuery.xhr = function( _native ) {
 		xhr = {
 			// state
 			readyState: 0,
-			
+
 			// Callback
 			onreadystatechange: null,
-			
+
 			// Open
 			open: function(type, url, async, username, password) {
-				
+
 				xhr.abort();
 				reset();
-				
+
 				s = {
 					type: type,
 					url: url,
@@ -454,128 +454,128 @@ jQuery.xhr = function( _native ) {
 					username: username,
 					password: password
 				};
-				
+
 				setState(1);
-				
+
 				return xhr;
 			},
-			
+
 			// Send
 			send: function(data, moreOptions) {
-				
+
 				checkState(1 , !sendFlag);
-				
+
 				s.data = data;
-				
+
 				s = jQuery.extend( true,
 					{},
 					jQuery.ajaxSettings,
 					s,
 					moreOptions || ( moreOptions === false ? { global: false } : {} ) );
-					
+
 				if ( moreOptions ) {
 					// We force the original context
 					// (plain objects used as context get extended)
 					s.context = moreOptions.context;
 				}
-				
+
 				init();
-				
+
 				// If not internal, abort
 				if ( ! internal ) {
 					done( 0 , "transport not found" );
 					return false;
 				}
-				
+
 				// Allow custom headers/mimetypes and early abort
 				if ( s.beforeSend ) {
-					
+
 					var _s = s;
-					
+
 					if ( s.beforeSend.call(callbackContext, xhr, s) === false || ! xhr.readyState || _s !== s ) {
-						
+
 						// Abort if not done
 						if ( xhr.readyState && _s === s ) {
 							xhr.abort();
 						}
-	
+
 						// Handle the global AJAX counter
 						if ( _s.global && ! --jQuery.active ) {
 							jQuery.event.trigger( "ajaxStop" );
 						}
-						
+
 						return false;
 					}
 				}
-				
+
 				sendFlag = 1;
-				
+
 				// Send global event
 				if ( s.global ) {
 					globalEventContext.trigger("ajaxSend", [xhr, s]);
 				}
-				
+
 				// Timeout
 				if ( s.async && s.timeout > 0 ) {
 					timeoutTimer = setTimeout(function(){
 						xhr.abort("timeout");
 					}, s.timeout);
 				}
-				
+
 				if ( s.async ) {
 					setState(1);
 				}
-				
+
 				try {
-					
+
 					internal.send(requestHeaders, done);
 					return xhr;
-											
+
 				} catch (e) {
-					
+
 					if ( done ) {
-						
+
 						done(0, "error", "" + e);
-						
+
 					} else {
-						
+
 						jQuery.error(e);
-						
+
 					}
 				}
-				
+
 				return false;
 			},
-			
+
 			// Caches the header
 			setRequestHeader: function(name,value) {
 				checkState(1, !sendFlag);
 				requestHeaders[ name.toLowerCase() ] = value;
 				return xhr;
 			},
-			
+
 			// Raw string
 			getAllResponseHeaders: function() {
 				return xhr.readyState <= 1 ? "" : responseHeadersString;
 			},
-			
+
 			// Builds headers hashtable if needed
 			getResponseHeader: function( key ) {
-				
+
 				if ( xhr.readyState <= 1 ) {
-					
+
 					return null;
-					
+
 				}
-				
+
 				if ( responseHeaders === undefined ) {
-					
+
 					responseHeaders = {};
-					
+
 					if ( typeof responseHeadersString === "string" ) {
-						
+
 						var match;
-						
+
 						while( ( match = rheaders.exec( responseHeadersString ) ) ) {
 							responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
 						}
@@ -583,7 +583,7 @@ jQuery.xhr = function( _native ) {
 				}
 				return responseHeaders[ key.toLowerCase() ];
 			},
-			
+
 			// Cancel the request
 			abort: function(statusText) {
 				if (internal) {
@@ -592,7 +592,7 @@ jQuery.xhr = function( _native ) {
 				xhr.readyState = 0;
 			}
 		};
-		
+
 	// Init data (so that we can bind callbacks early
 	reset(1);
 
@@ -607,82 +607,82 @@ jQuery.xhr = function( _native ) {
 			return this;
 		};
 	});
-	
+
 	// Return the xhr emulation
 	return xhr;
 };
 
 // Create a callback list
 function createCBList() {
-	
+
 	var functors = [],
 		autoFire = 0,
 		fireArgs,
 		list = {
-		
+
 			fire: function( flag , context ) {
-				
+
 				// Save info for later bindings
 				fireArgs = arguments;
-				
+
 				// Remove autoFire to keep bindings in order
 				autoFire = 0;
-					
+
 				var args = sliceFunc.call( fireArgs , 2 );
-					
+
 				// Execute callbacks
 				while ( flag && functors.length ) {
 					flag = functors.shift().apply( context , args ) !== false;
 				}
-					
+
 				// Clean if asked to stop
 				if ( ! flag ) {
 					clean();
 				}
-						
+
 				// Set autoFire
-				autoFire = 1;					
+				autoFire = 1;
 			},
-			
+
 			bind: function() {
-				
+
 				var args = arguments,
 					i = 0,
 					length = args.length,
 					func;
-				
+
 				for ( ; i < length ; i++ ) {
-					
+
 					func = args[ i ];
-					
+
 					if ( jQuery.isArray(func) ) {
-						
+
 						list.bind.apply( list , func );
-						
+
 					} else if ( isFunction(func) ) {
-						
+
 						// Add if not already in
 						if ( ! pos( func ) ) {
 							functors.push( func );
 						}
 					}
 				}
-				
+
 				if ( autoFire ) {
 					list.fire.apply( list , fireArgs );
 				}
 			},
-			
+
 			unbind: function() {
-				
+
 				var i = 0,
 					args = arguments,
 					length = args.length,
-					func,					
+					func,
 					position;
-					
+
 				if ( length ) {
-						
+
 					for( ; i < length ; i++ ) {
 						func = args[i];
 						if ( jQuery.isArray(func) ) {
@@ -694,15 +694,15 @@ function createCBList() {
 							}
 						}
 					}
-				
+
 				} else {
-					
+
 					functors = [];
-				
+
 				}
 
 			}
-			
+
 		};
 
 	// Get the index of the functor in the list (1-based)
@@ -711,7 +711,7 @@ function createCBList() {
 		}
 		return i < length ? ( i + 1 ) : 0;
 	}
-		
+
 	// Clean the object
 	function clean() {
 		// Empty callbacks list
@@ -721,12 +721,12 @@ function createCBList() {
 			list[i] = jQuery.noop;
 		}
 	}
-				
+
 	return list;
 }
 
 jQuery.extend(jQuery.xhr, {
-	
+
 	// Add new prefilter
 	prefilter: function (functor) {
 		if ( isFunction(functor) ) {
@@ -734,10 +734,10 @@ jQuery.extend(jQuery.xhr, {
 		}
 		return this;
 	},
-	
+
 	// Bind a transport to one or more dataTypes
 	bindTransport: function () {
-		
+
 		var args = arguments,
 			i,
 			start = 0,
@@ -749,63 +749,63 @@ jQuery.extend(jQuery.xhr, {
 			append,
 			list,
 			transports = jQuery.ajaxSettings.transports;
-			
+
 		if ( length ) {
-				
+
 			if ( ! isFunction( args[ 0 ] ) ) {
-				
+
 				dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
 				start = 1;
-				
+
 			}
-			
+
 			if ( dataTypes.length && start < length ) {
-				
+
 				for ( i = start; i < length; i++ ) {
 					functor = args[i];
 					if ( isFunction(functor) ) {
 						functors.push( functor );
 					}
 				}
-						
+
 				if ( functors.length ) {
-							
+
 					jQuery.each ( dataTypes, function( _ , dataType ) {
-						
+
 						first = /^\+/.test( dataType );
-						
+
 						if (first) {
 							dataType = dataType.substr(1);
 						}
-						
+
 						if ( dataType !== "" ) {
-						
+
 							append = Array.prototype[ first ? "unshift" : "push" ];
-							
+
 							list = transports[ dataType ];
-					
+
 							jQuery.each ( functors, function( _ , functor ) {
-									
+
 								if ( ! list ) {
-									
+
 									list = transports[ dataType ] = [ functor ];
-									
+
 								} else {
-									
+
 									append.call( list , functor );
 								}
 							} );
 						}
-									
+
 					} );
 				}
 			}
 		}
-		
+
 		return this;
 	}
 
-	
+
 });
 
 // Select a transport given options
@@ -819,13 +819,13 @@ function selectTransport( s ) {
 		length,
 		checked = {},
 		flag;
-		
+
 	function initSearch( dataType ) {
 
 		flag = transportDataType !== dataType && ! checked[ dataType ];
-		
+
 		if ( flag ) {
-			
+
 			checked[ dataType ] = 1;
 			transportDataType = dataType;
 			transportsList = s.transports[ dataType ];
@@ -835,15 +835,15 @@ function selectTransport( s ) {
 
 		return flag;
 	}
-	
+
 	initSearch( dataTypes[ 0 ] );
 
 	for ( i = 0 ; ! transport && i <= length ; i++ ) {
-		
+
 		if ( i === length ) {
-			
+
 			initSearch( "*" );
-			
+
 		} else {
 
 			transport = transportsList[ i ]( s , determineDataType );
@@ -861,18 +861,18 @@ function selectTransport( s ) {
 
 	return transport;
 }
-	
+
 // Utility function that handles dataType when response is received
 // (for those transports that can give text or xml responses)
 function determineDataType( s , ct , text , xml ) {
-	
+
 	var autoDataType = s.autoDataType,
 		type,
 		regexp,
 		dataTypes = s.dataTypes,
 		transportDataType = dataTypes[0],
 		response;
-	
+
 	// Auto (xml, json, script or text determined given headers)
 	if ( transportDataType === "*" ) {
 
@@ -881,29 +881,29 @@ function determineDataType( s , ct , text , xml ) {
 				transportDataType = dataTypes[0] = type;
 				break;
 			}
-		}			
-	} 
-	
+		}
+	}
+
 	// xml and parsed as such
 	if ( transportDataType === "xml" &&
 		xml &&
 		xml.documentElement /* #4958 */ ) {
-		
+
 		response = xml;
-	
+
 	// Text response was provided
 	} else {
-		
+
 		response = text;
-		
+
 		// If it's not really text, defer to dataConverters
 		if ( transportDataType !== "text" ) {
 			dataTypes.unshift( "text" );
 		}
-		
+
 	}
-	
+
 	return response;
-}	
+}
 
 })( jQuery );
diff --git a/test/data/headers.php b/test/data/headers.php
index f2c21c0cc..c3cb72961 100644
--- a/test/data/headers.php
+++ b/test/data/headers.php
@@ -4,16 +4,16 @@ header( "Sample-Header: Hello World" );
 
 $headers = array();
 
-foreach( $_SERVER as $key => $value ) { 
-	
-	if ( substr( $key , 0 , 5 ) == "HTTP_" ) { 
-		
+foreach( $_SERVER as $key => $value ) {
+
+	if ( substr( $key , 0 , 5 ) == "HTTP_" ) {
+
 		$key = str_replace( "_" , "-" , substr( $key , 5) );
 		$headers[ $key ] = $value;
 
 	}
-	
-} 
+
+}
 
 foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
 	echo "$key: " . $headers[ strtoupper( $key ) ] . "\n";
diff --git a/test/data/params_html.php b/test/data/params_html.php
index 0bab00f29..e88ef1521 100644
--- a/test/data/params_html.php
+++ b/test/data/params_html.php
@@ -1,12 +1,12 @@
 <div id="post">
-<?php 
+<?php
 	foreach( $_POST as $key=>$value )
 		echo "<b id='$key'>$value</b>";
-?> 
+?>
 </div>
 <div id="get">
 <?php
 	foreach( $_GET as $key=>$value )
 		echo "<b id='$key'>$value</b>";
-?> 
+?>
 </div>
\ No newline at end of file
diff --git a/test/delegatetest.html b/test/delegatetest.html
index 327085c84..6479d26ec 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -206,7 +206,7 @@
 	$(document).bind("focusin", function() {
 		jQuery("#boundFocus").blink();
 	});
-	
+
 	$(document).bind("focusout", function() {
 		jQuery("#boundBlur").blink();
 	});
@@ -229,14 +229,14 @@
 	$(document).bind("change", function(){
 		jQuery("#boundChange").blink();
 	});
-	
+
 	$("#text_submit").addSubmitTest("#textSubmit", true);
 	$("#password_submit").addSubmitTest("#passwordSubmit", true);
 	$("#submit_submit").addSubmitTest("#submitSubmit", true);
 	$(document).bind("submit", function(){
 		jQuery("#boundSubmit").blink();
 	});
-	
+
         </script>
     </body>
 </html>
diff --git a/test/polluted.php b/test/polluted.php
index 3ddb7acd2..55df0dd89 100644
--- a/test/polluted.php
+++ b/test/polluted.php
@@ -15,7 +15,7 @@
 		$suite = file_get_contents('index.html');
 		echo str_replace( '<!-- Includes -->', $includes, $suite );
 		exit;
-	}	
+	}
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -43,7 +43,7 @@
 	<h1 id="header">jQuery Test Suite</h1>
 	<h2 id="banner" class="fail"></h2>
 	<h2 id="userAgent">Choose other libraries to include</h2>
-	
+
 	<form class="otherlibs" action="" method="post">
 		<?php
 			$libs = scandir('otherlibs');
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 35c030247..beec2c537 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -71,9 +71,9 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
 });
 
 test("jQuery.ajax() - success/error callbacks (remote)", function() {
-	
+
 	var supports = jQuery.support.cors;
-	
+
 	expect( supports ? 9 : 6 );
 
 	jQuery.ajaxSetup({ timeout: 0 });
@@ -221,7 +221,7 @@ test("jQuery.ajax() - success callbacks (order)", function() {
 	jQuery.ajaxSetup({ timeout: 0 });
 
 	stop();
-	
+
 	var testString = "";
 
 	setTimeout(function(){
@@ -281,9 +281,9 @@ test("jQuery.ajax() - error callbacks", function() {
 test(".ajax() - headers" , function() {
 
 	expect( 2 );
-	
+
 	stop();
-	
+
 	var requestHeaders = {
 		siMPle: "value",
 		"SometHing-elsE": "other value",
@@ -291,11 +291,11 @@ test(".ajax() - headers" , function() {
 		},
 		list = [],
 		i;
-		
+
 	for( i in requestHeaders ) {
 		list.push( i );
 	}
-	
+
 	jQuery.ajax(url("data/headers.php?keys="+list.join( "_" ) ), {
 		headers: requestHeaders,
 		success: function( data , _ , xhr ) {
@@ -304,19 +304,19 @@ test(".ajax() - headers" , function() {
 				tmp.push( i , ": " , requestHeaders[ i ] , "\n" );
 			}
 			tmp = tmp.join( "" );
-			
+
 			equals( data , tmp , "Headers were sent" );
 			equals( xhr.getResponseHeader( "Sample-Header" ) , "Hello World" , "Sample header received" );
 			start();
 		},
 		error: function(){ ok(false, "error"); }
 	});
-		
+
 });
 
 test(".ajax() - hash", function() {
 	expect(3);
-	
+
 	jQuery.ajax({
 		url: "data/name.html#foo",
 		beforeSend: function( xhr, settings ) {
@@ -324,7 +324,7 @@ test(".ajax() - hash", function() {
 			return false;
 		}
 	});
-	
+
 	jQuery.ajax({
 		url: "data/name.html?abc#foo",
 		beforeSend: function( xhr, settings ) {
@@ -332,7 +332,7 @@ test(".ajax() - hash", function() {
 			return false;
 		}
 	});
-	
+
 	jQuery.ajax({
 		url: "data/name.html?abc#foo",
 		data: { "test": 123 },
@@ -346,7 +346,7 @@ test(".ajax() - hash", function() {
 test(".ajax() - 304", function() {
 	expect( 1 );
 	stop();
-	
+
 	jQuery.ajax({
 		url: url("data/notmodified.php"),
 		success: function(){ ok(true, "304 ok"); },
@@ -415,7 +415,7 @@ test("jQuery.ajax() - readyState (success)", function() {
 	jQuery.ajaxSetup({ timeout: 0 });
 
 	stop();
-	
+
 	var control = "";
 
 	setTimeout(function(){
@@ -426,7 +426,7 @@ test("jQuery.ajax() - readyState (success)", function() {
 					control += xhr.readyState;
 				}
 			},
-			complete: function(){ 
+			complete: function(){
 				setTimeout( function() {
 					equals( control , "1234" , "onreadystatechange was properly called" );
 				}, 13 );
@@ -442,7 +442,7 @@ test("jQuery.ajax() - readyState (abort)", function() {
 	jQuery.ajaxSetup({ timeout: 0 });
 
 	stop();
-	
+
 	var control = "";
 
 	setTimeout(function(){
@@ -456,7 +456,7 @@ test("jQuery.ajax() - readyState (abort)", function() {
 					control += xhr.readyState;
 				}
 			},
-			complete: function( xhr ){ 
+			complete: function( xhr ){
 				setTimeout( function() {
 					equals( control , "14" , "onreadystatechange was properly called" );
 					equals( xhr.readyState, 0 , "readyState is 0" );
@@ -473,9 +473,9 @@ test("jQuery.xhr() - reuse", function() {
 	jQuery.ajaxSetup({ timeout: 0 });
 
 	stop();
-	
+
 	var number = 0;
-	
+
 	setTimeout(function(){
 		jQuery('#foo').ajaxStart(function(){
 			ok( true, "ajaxStart" );
@@ -499,7 +499,7 @@ test("jQuery.xhr() - reuse", function() {
 			success: function( _1 , _2 , xhr ){
 				ok(true, "success (1)");
 				xhr.complete(function() {
-					ok(true, "complete (1bis)"); 
+					ok(true, "complete (1bis)");
 				});
 				xhr.open( "GET", url("data/name.html") );
 				xhr.success( function(){ ok(true, "beforeSend (2)"); } )
@@ -521,7 +521,7 @@ test("jQuery.xhr() - early binding", function() {
 	jQuery.ajaxSetup({ timeout: 0 });
 
 	stop();
-	
+
 	jQuery.xhr()
 		.success( function(){ ok(true, "success"); } )
 		.error( function(){ ok(false, "error"); } )
@@ -531,20 +531,20 @@ test("jQuery.xhr() - early binding", function() {
 });
 
 test("jQuery.xhr() - get native implementation", function() {
-	
+
 	var xhr = jQuery.xhr(true);
-	
+
 	ok( xhr.readyState !== undefined , "implements XMLHttpRequest" );
 	ok( ! jQuery.isFunction( xhr.success ) , "is not jQuery's abstraction" );
-	
+
 });
 
 test("Ajax events with context", function() {
 	expect(14);
-	
+
 	stop();
 	var context = document.createElement("div");
-	
+
 	function event(e){
 		equals( this, context, e.type );
 	}
@@ -560,7 +560,7 @@ test("Ajax events with context", function() {
 			equals( typeof this.url, "string", "context is settings on callback " + msg );
 		};
 	}
-	
+
 	jQuery('#foo').add(context)
 			.ajaxSend(event)
 			.ajaxComplete(event)
@@ -721,7 +721,7 @@ test("jQuery.ajax - HEAD requests", function() {
 		success: function(data, status, xhr){
 			var h = xhr.getAllResponseHeaders();
 			ok( /Date/i.test(h), 'No Date in HEAD response' );
-			
+
 			jQuery.ajax({
 				url: url("data/name.html"),
 				data: { whip_it: "good" },
@@ -863,9 +863,9 @@ test("serialize()", function() {
 
 test("jQuery.param()", function() {
 	expect(22);
-	
+
 	equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" );
-  
+
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
 	equals( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
 
@@ -880,13 +880,13 @@ test("jQuery.param()", function() {
 
 	params = {foo: { bar: 'baz', beep: 42, quux: 'All your base are belong to us' } };
 	equals( jQuery.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
-	
+
 	params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" };
 	equals( decodeURIComponent( jQuery.param(params) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=undefined&i[]=10&i[]=11&j=true&k=false&l[]=undefined&l[]=0&m=cowboy+hat?", "huge structure" );
-	
+
 	params = { a: [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { b: [ 7, [ 8, 9 ], [ { c: 10, d: 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { e: { f: { g: [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] };
 	equals( decodeURIComponent( jQuery.param(params) ), "a[]=0&a[1][]=1&a[1][]=2&a[2][]=3&a[2][1][]=4&a[2][1][]=5&a[2][2][]=6&a[3][b][]=7&a[3][b][1][]=8&a[3][b][1][]=9&a[3][b][2][0][c]=10&a[3][b][2][0][d]=11&a[3][b][3][0][]=12&a[3][b][4][0][0][]=13&a[3][b][5][e][f][g][]=14&a[3][b][5][e][f][g][1][]=15&a[3][b][]=16&a[]=17", "nested arrays" );
-	
+
 	params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" };
 	equals( jQuery.param(params,true), "a=1&a=2&b=%5Bobject+Object%5D&i=10&i=11&j=true&k=false&l=undefined&l=0&m=cowboy+hat%3F", "huge structure, forced traditional" );
 
@@ -898,7 +898,7 @@ test("jQuery.param()", function() {
 	equals( jQuery.param({"foo": {"bar": {}} }), "foo%5Bbar%5D=", "Empty object param" );
 
 	jQuery.ajaxSetup({ traditional: true });
-	
+
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
 	equals( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
 
@@ -913,16 +913,16 @@ test("jQuery.param()", function() {
 
 	params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"};
 	equals( jQuery.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
-	
+
 	params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" };
 	equals( jQuery.param(params), "a=1&a=2&b=%5Bobject+Object%5D&i=10&i=11&j=true&k=false&l=undefined&l=0&m=cowboy+hat%3F", "huge structure" );
-	
+
 	params = { a: [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { b: [ 7, [ 8, 9 ], [ { c: 10, d: 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { e: { f: { g: [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] };
 	equals( jQuery.param(params), "a=0&a=1%2C2&a=3%2C4%2C5%2C6&a=%5Bobject+Object%5D&a=17", "nested arrays (not possible when jQuery.param.traditional == true)" );
-	
+
 	params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" };
 	equals( decodeURIComponent( jQuery.param(params,false) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=undefined&i[]=10&i[]=11&j=true&k=false&l[]=undefined&l[]=0&m=cowboy+hat?", "huge structure, forced not traditional" );
-	
+
 	params = { param1: null };
 	equals( jQuery.param(params,false), "param1=null", "Make sure that null params aren't traversed." );
 });
@@ -971,7 +971,7 @@ test("pass-through request object", function() {
 
 test("ajax cache", function () {
 	expect(18);
-	
+
 	stop();
 
 	var count = 0;
@@ -1384,7 +1384,7 @@ test("jQuery.ajax() - script, Remote with POST", function() {
 	expect(3);
 
 	var base = window.location.href.replace(/[^\/]*$/, "");
-	
+
 	stop();
 
 	jQuery.ajax({
@@ -1525,7 +1525,7 @@ test("jQuery.getJSON(String, Function) - JSON object", function() {
 
 test("jQuery.getJSON - Using Native JSON", function() {
 	expect(2);
-	
+
 	var old = window.JSON;
 	JSON = {
 		parse: function(str){
@@ -1740,13 +1740,13 @@ test("jQuery.ajax - If-Modified-Since support", function() {
 	jQuery.ajax({
 		url: url,
 		ifModified: true,
-		success: function(data, status) { 
+		success: function(data, status) {
 			equals(status, "success");
-			
+
 			jQuery.ajax({
 				url: url,
 				ifModified: true,
-				success: function(data, status) { 
+				success: function(data, status) {
 					if ( data === "FAIL" ) {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
@@ -1787,13 +1787,13 @@ test("jQuery.ajax - Etag support", function() {
 	jQuery.ajax({
 		url: url,
 		ifModified: true,
-		success: function(data, status) { 
+		success: function(data, status) {
 			equals(status, "success");
-			
+
 			jQuery.ajax({
 				url: url,
 				ifModified: true,
-				success: function(data, status) { 
+				success: function(data, status) {
 					if ( data === "FAIL" ) {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
@@ -1826,38 +1826,38 @@ test("jQuery.ajax - Etag support", function() {
 test("jQuery ajax - failing cross-domain", function() {
 
 	expect( 2 );
-	
+
 	stop();
-	
+
 	var i = 2;
-	
+
 	jQuery.ajax({
 		url: 'http://somewebsitethatdoesnotexist.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
 	});
-	
+
 	jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
 	});
-	
+
 });
 
 test("jQuery ajax - atom+xml", function() {
 
 	stop();
-	
+
 	jQuery.ajax({
 		url: url( 'data/atom+xml.php' ),
 		success: function(){ ok( true , "success" ); },
 		error: function(){ ok( false , "error" ); },
 		complete: function() { start(); }
 	});
-	
+
 });
 
 test("jQuery.ajax - active counter", function() {
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index f9506b30b..a1ab58179 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -4,13 +4,13 @@ var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
 test("jQuery.props: itegrity test", function() {
-  
+
   expect(1);
-  
+
   //  This must be maintained and equal jQuery.props
-  //  Ensure that accidental or erroneous property 
+  //  Ensure that accidental or erroneous property
   //  overwrites don't occur
-  //  This is simply for better code coverage and future proofing. 
+  //  This is simply for better code coverage and future proofing.
   var propsShouldBe = {
     "for": "htmlFor",
     "class": "className",
@@ -23,7 +23,7 @@ test("jQuery.props: itegrity test", function() {
     usemap: "useMap",
     frameborder: "frameBorder"
   };
-  
+
   same(propsShouldBe, jQuery.props, "jQuery.props passes integrity check");
 
 });
@@ -33,7 +33,7 @@ test("attr(String)", function() {
 
 	// This one sometimes fails randomly ?!
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
-	
+
 	equals( jQuery('#text1').attr('value', "Test2").attr('defaultValue'), "Test", 'Check for defaultValue attribute' );
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -255,30 +255,30 @@ test("attr(String, Object)", function() {
 
 test("attr(jquery_method)", function(){
 	expect(7);
-	
+
 	var $elem = jQuery("<div />"),
 		elem = $elem[0];
-	
-	// one at a time	
+
+	// one at a time
 	$elem.attr({'html': 'foo'}, true);
 	equals( elem.innerHTML, 'foo', 'attr(html)');
-	
+
 	$elem.attr({'text': 'bar'}, true);
 	equals( elem.innerHTML, 'bar', 'attr(text)');
-	
+
 	$elem.attr({'css': {color:'red'}}, true);
 	ok( /^(#ff0000|red)$/i.test(elem.style.color), 'attr(css)');
-	
+
 	$elem.attr({'height': 10}, true);
 	equals( elem.style.height, '10px', 'attr(height)');
-	
+
 	// Multiple attributes
-	
+
 	$elem.attr({
 		width:10,
 		css:{ paddingLeft:1, paddingRight:1 }
 	}, true);
-	
+
 	equals( elem.style.width, '10px', 'attr({...})');
 	equals( elem.style.paddingLeft, '1px', 'attr({...})');
 	equals( elem.style.paddingRight, '1px', 'attr({...})');
@@ -491,7 +491,7 @@ test( "val(Array of Numbers) (Bug #7123)", function() {
 	ok( elements[1].checked, "Second element was checked" );
 	ok( !elements[2].checked, "Third element was unchecked" );
 	ok( !elements[3].checked, "Fourth element remained unchecked" );
-	
+
 	elements.remove();
 });
 
@@ -672,7 +672,7 @@ test("removeClass(Function) with incoming value", function() {
 
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	QUnit.reset();	
+	QUnit.reset();
 });
 
 var testToggleClass = function(valueObj) {
@@ -740,21 +740,21 @@ test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
 
 	var e = jQuery("#firstp"), old = e.attr("class");
 	ok( !e.is(".test"), "Assert class not present" );
-	
+
 	e.toggleClass(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return "test";
 	});
 	ok( e.is(".test"), "Assert class present" );
-	
+
 	old = e.attr("class");
-	
+
 	e.toggleClass(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return "test";
 	});
 	ok( !e.is(".test"), "Assert class not present" );
-	
+
 	old = e.attr("class");
 
 	// class name with a boolean
@@ -764,18 +764,18 @@ test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
 		return "test";
 	}, false );
 	ok( !e.is(".test"), "Assert class not present" );
-	
+
 	old = e.attr("class");
-	
+
 	e.toggleClass(function(i, val, state) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		equals( state, true, "Make sure that the state is passed in." );
 		return "test";
 	}, true );
 	ok( e.is(".test"), "Assert class present" );
-	
+
 	old = e.attr("class");
-	
+
 	e.toggleClass(function(i, val, state) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		equals( state, false, "Make sure that the state is passed in." );
@@ -790,25 +790,25 @@ test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
 
 test("addClass, removeClass, hasClass", function() {
 	expect(17);
- 
+
 	var jq = jQuery("<p>Hi</p>"), x = jq[0];
- 
+
 	jq.addClass("hi");
 	equals( x.className, "hi", "Check single added class" );
- 
+
 	jq.addClass("foo bar");
 	equals( x.className, "hi foo bar", "Check more added classes" );
- 
+
 	jq.removeClass();
 	equals( x.className, "", "Remove all classes" );
- 
+
 	jq.addClass("hi foo bar");
 	jq.removeClass("foo");
 	equals( x.className, "hi bar", "Check removal of one class" );
- 
+
 	ok( jq.hasClass("hi"), "Check has1" );
 	ok( jq.hasClass("bar"), "Check has2" );
- 
+
 	var jq = jQuery("<p class='class1\nclass2\tcla.ss3\n\rclass4'></p>");
 	ok( jq.hasClass("class1"), "Check hasClass with line feed" );
 	ok( jq.is(".class1"), "Check is with line feed" );
@@ -817,7 +817,7 @@ test("addClass, removeClass, hasClass", function() {
 	ok( jq.hasClass("cla.ss3"), "Check hasClass with dot" );
 	ok( jq.hasClass("class4"), "Check hasClass with carriage return" );
 	ok( jq.is(".class4"), "Check is with carriage return" );
- 
+
 	jq.removeClass("class2");
 	ok( jq.hasClass("class2")==false, "Check the class has been properly removed" );
 	jq.removeClass("cla");
diff --git a/test/unit/css.js b/test/unit/css.js
index cddd90256..fbbf937ca 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -178,24 +178,24 @@ if ( !jQuery.support.opacity ) {
 
 test("css(String, Function)", function() {
 	expect(3);
-	
+
 	var sizes = ["10px", "20px", "30px"];
-	
-	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-				 "<div class='cssFunction'></div>" + 
+
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
+				 "<div class='cssFunction'></div>" +
 				 "<div class='cssFunction'></div></div>")
 		.appendTo("body");
-	
+
 	var index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css("font-size", function() {
 		var size = sizes[index];
 		index++;
 		return size;
 	});
-	
+
 	index = 0;
-	
+
 	jQuery("#cssFunctionTest div").each(function() {
 		var computedSize = jQuery(this).css("font-size")
 		var expectedSize = sizes[index]
@@ -208,24 +208,24 @@ test("css(String, Function)", function() {
 
 test("css(String, Function) with incoming value", function() {
 	expect(3);
-	
+
 	var sizes = ["10px", "20px", "30px"];
-	
-	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-				 "<div class='cssFunction'></div>" + 
+
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
+				 "<div class='cssFunction'></div>" +
 				 "<div class='cssFunction'></div></div>")
 		.appendTo("body");
-	
+
 	var index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css("font-size", function() {
 		var size = sizes[index];
 		index++;
 		return size;
 	});
-	
+
 	index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css("font-size", function(i, computedSize) {
 		var expectedSize = sizes[index]
 		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
@@ -238,61 +238,61 @@ test("css(String, Function) with incoming value", function() {
 
 test("css(Object) where values are Functions", function() {
 	expect(3);
-	
+
 	var sizes = ["10px", "20px", "30px"];
-	
-	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-				 "<div class='cssFunction'></div>" + 
+
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
+				 "<div class='cssFunction'></div>" +
 				 "<div class='cssFunction'></div></div>")
 		.appendTo("body");
 
 	var index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css({fontSize: function() {
 		var size = sizes[index];
 		index++;
 		return size;
 	}});
-	
+
 	index = 0;
-	
+
 	jQuery("#cssFunctionTest div").each(function() {
 		var computedSize = jQuery(this).css("font-size")
 		var expectedSize = sizes[index]
 		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
 		index++;
 	});
-	
+
 	jQuery("#cssFunctionTest").remove();
 });
 
 test("css(Object) where values are Functions with incoming values", function() {
 	expect(3);
-	
+
 	var sizes = ["10px", "20px", "30px"];
-	
-	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-				 "<div class='cssFunction'></div>" + 
+
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
+				 "<div class='cssFunction'></div>" +
 				 "<div class='cssFunction'></div></div>")
 		.appendTo("body");
 
 	var index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css({fontSize: function() {
 		var size = sizes[index];
 		index++;
 		return size;
 	}});
-	
+
 	index = 0;
-	
+
 	jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
 		var expectedSize = sizes[index]
 		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
 		index++;
 		return computedSize;
 	}});
-	
+
 	jQuery("#cssFunctionTest").remove();
 });
 
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 8255bf325..b38e73bba 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -45,13 +45,13 @@ test("width() with function", function() {
 
 test("width() with function args", function() {
 	expect( 2 );
-	
+
 	var $div = jQuery("#nothiddendiv");
 	$div.width( 30 ).width(function(i, width) {
 		equals( width, 30, "Make sure previous value is corrrect." );
 		return width + 1;
 	});
-	
+
 	equals( $div.width(), 31, "Make sure value was modified correctly." );
 });
 
@@ -92,13 +92,13 @@ test("height() with function", function() {
 
 test("height() with function args", function() {
 	expect( 2 );
-	
+
 	var $div = jQuery("#nothiddendiv");
 	$div.height( 30 ).height(function(i, height) {
 		equals( height, 30, "Make sure previous value is corrrect." );
 		return height + 1;
 	});
-	
+
 	equals( $div.height(), 31, "Make sure value was modified correctly." );
 });
 
@@ -112,13 +112,13 @@ test("innerWidth()", function() {
 		border: "2px solid #fff",
 		width: 30
 	});
-	
+
 	equals($div.innerWidth(), 30, "Test with margin and border");
 	$div.css("padding", "20px");
 	equals($div.innerWidth(), 70, "Test with margin, border and padding");
 	$div.hide();
 	equals($div.innerWidth(), 70, "Test hidden div");
-	
+
 	// reset styles
 	$div.css({ display: "", border: "", padding: "", width: "", height: "" });
 
@@ -130,7 +130,7 @@ test("innerWidth()", function() {
 
 test("innerHeight()", function() {
 	expect(4);
-	
+
 	var $div = jQuery("#nothiddendiv");
 	// set styles
 	$div.css({
@@ -138,13 +138,13 @@ test("innerHeight()", function() {
 		border: "2px solid #fff",
 		height: 30
 	});
-	
+
 	equals($div.innerHeight(), 30, "Test with margin and border");
 	$div.css("padding", "20px");
 	equals($div.innerHeight(), 70, "Test with margin, border and padding");
 	$div.hide();
 	equals($div.innerHeight(), 70, "Test hidden div");
-	
+
 	// reset styles
 	$div.css({ display: "", border: "", padding: "", width: "", height: "" });
 
@@ -156,10 +156,10 @@ test("innerHeight()", function() {
 
 test("outerWidth()", function() {
 	expect(7);
-	
+
 	var $div = jQuery("#nothiddendiv");
 	$div.css("width", 30);
-	
+
 	equals($div.outerWidth(), 30, "Test with only width set");
 	$div.css("padding", "20px");
 	equals($div.outerWidth(), 70, "Test with padding");
@@ -171,7 +171,7 @@ test("outerWidth()", function() {
 	equals($div.outerWidth(true), 94, "Test with padding, border and margin with margin option");
 	$div.hide();
 	equals($div.outerWidth(true), 94, "Test hidden div with padding, border and margin with margin option");
-	
+
 	// reset styles
 	$div.css({ position: "", display: "", border: "", padding: "", width: "", height: "" });
 
@@ -183,10 +183,10 @@ test("outerWidth()", function() {
 
 test("outerHeight()", function() {
 	expect(7);
-	
+
 	var $div = jQuery("#nothiddendiv");
 	$div.css("height", 30);
-	
+
 	equals($div.outerHeight(), 30, "Test with only width set");
 	$div.css("padding", "20px");
 	equals($div.outerHeight(), 70, "Test with padding");
@@ -197,7 +197,7 @@ test("outerHeight()", function() {
 	equals($div.outerHeight(true), 94, "Test with padding, border and margin with margin option");
 	$div.hide();
 	equals($div.outerHeight(true), 94, "Test hidden div with padding, border and margin with margin option");
-	
+
 	// reset styles
 	$div.css({ display: "", border: "", padding: "", width: "", height: "" });
 
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 969079683..e96f6b6f0 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -64,7 +64,7 @@ test("show()", function() {
 
 	// #show-tests * is set display: none in CSS
 	jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id="test-table"></table>');
-	
+
 	var old = jQuery("#test-table").show().css("display") !== "table";
 	jQuery("#test-table").remove();
 
@@ -140,15 +140,15 @@ test("Persist correct display value", function() {
 
 	// #show-tests * is set display: none in CSS
 	jQuery("#main").append('<div id="show-tests"><span style="position:absolute;">foo</span></div>');
-  
-	var $span = jQuery("#show-tests span"),  
+
+	var $span = jQuery("#show-tests span"),
 	  displayNone = $span.css("display"),
 	  display = '', num = 0;
-		
+
   $span.show();
-  
+
   display = $span.css("display");
-  
+
   $span.hide();
 
   $span.fadeIn(100, function() {
@@ -156,13 +156,13 @@ test("Persist correct display value", function() {
     equals($span.css("display"), display, "Expecting display: " + display);
 
     $span.fadeOut(100, function () {
-  
+
       equals($span.css("display"), displayNone, "Expecting display: " + displayNone);
-      
+
       $span.fadeIn(100, function() {
-      
+
         equals($span.css("display"), display, "Expecting display: " + display);
-      
+
         start();
       });
     });
@@ -194,7 +194,7 @@ test("animate block as inline width/height", function() {
 
 	var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
 		expected = span.css("display");
-	
+
 	span.remove();
 
 	if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
@@ -220,7 +220,7 @@ test("animate native inline width/height", function() {
 
 	var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
 		expected = span.css("display");
-	
+
 	span.remove();
 
 	if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
@@ -889,7 +889,7 @@ test("hide hidden elements, with animation (bug #7141)", function() {
 	expect(3);
 	QUnit.reset();
 	stop();
-	
+
 	var div = jQuery("<div style='display:none'></div>").appendTo("#main");
 	equals( div.css("display"), "none", "Element is hidden by default" );
 	div.hide(1, function () {
diff --git a/test/unit/event.js b/test/unit/event.js
index 83f6096d7..b4672a8b8 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -4,20 +4,20 @@ test("null or undefined handler", function() {
 	expect(2);
   // Supports Fixes bug #7229
   try {
-  
+
     jQuery("#firstp").click(null);
-  
+
     ok(true, "Passing a null handler will not throw an exception");
 
-  } catch (e) {}  
+  } catch (e) {}
 
   try {
-  
+
     jQuery("#firstp").click(undefined);
-  
+
     ok(true, "Passing an undefined handler will not throw an exception");
 
-  } catch (e) {}  
+  } catch (e) {}
 });
 
 test("bind(), with data", function() {
@@ -175,7 +175,7 @@ test("bind(), no data", function() {
 
 test("bind/one/unbind(Object)", function(){
 	expect(6);
-	
+
 	var clickCounter = 0, mouseoverCounter = 0;
 	function handler(event) {
 		if (event.type == "click")
@@ -183,18 +183,18 @@ test("bind/one/unbind(Object)", function(){
 		else if (event.type == "mouseover")
 			mouseoverCounter++;
 	};
-	
+
 	function handlerWithData(event) {
 		if (event.type == "click")
 			clickCounter += event.data;
 		else if (event.type == "mouseover")
 			mouseoverCounter += event.data;
 	};
-	
+
 	function trigger(){
 		$elem.trigger("click").trigger("mouseover");
 	}
-	
+
 	var $elem = jQuery("#firstp")
 		// Regular bind
 		.bind({
@@ -206,16 +206,16 @@ test("bind/one/unbind(Object)", function(){
 			click:handlerWithData,
 			mouseover:handlerWithData
 		}, 2 );
-	
+
 	trigger();
-	
+
 	equals( clickCounter, 3, "bind(Object)" );
 	equals( mouseoverCounter, 3, "bind(Object)" );
-	
+
 	trigger();
 	equals( clickCounter, 4, "bind(Object)" );
 	equals( mouseoverCounter, 4, "bind(Object)" );
-	
+
 	jQuery("#firstp").unbind({
 		click:handler,
 		mouseover:handler
@@ -228,10 +228,10 @@ test("bind/one/unbind(Object)", function(){
 
 test("live/die(Object), delegate/undelegate(String, Object)", function() {
 	expect(6);
-	
+
 	var clickCounter = 0, mouseoverCounter = 0,
 		$p = jQuery("#firstp"), $a = $p.find("a:first");
-	
+
 	var events = {
 		click: function( event ) {
 			clickCounter += ( event.data || 1 );
@@ -240,26 +240,26 @@ test("live/die(Object), delegate/undelegate(String, Object)", function() {
 			mouseoverCounter += ( event.data || 1 );
 		}
 	};
-	
+
 	function trigger() {
 		$a.trigger("click").trigger("mouseover");
 	}
-	
+
 	$a.live( events );
 	$p.delegate( "a", events, 2 );
-	
+
 	trigger();
 	equals( clickCounter, 3, "live/delegate" );
 	equals( mouseoverCounter, 3, "live/delegate" );
-	
+
 	$p.undelegate( "a", events );
-	
+
 	trigger();
 	equals( clickCounter, 4, "undelegate" );
 	equals( mouseoverCounter, 4, "undelegate" );
-	
+
 	$a.die( events );
-	
+
 	trigger();
 	equals( clickCounter, 4, "die" );
 	equals( mouseoverCounter, 4, "die" );
@@ -267,12 +267,12 @@ test("live/die(Object), delegate/undelegate(String, Object)", function() {
 
 test("live/delegate immediate propagation", function() {
 	expect(2);
-	
+
 	var $p = jQuery("#firstp"), $a = $p.find("a:first"), lastClick;
-	
+
 	lastClick = "";
-	$a.live( "click", function(e) { 
-		lastClick = "click1"; 
+	$a.live( "click", function(e) {
+		lastClick = "click1";
 		e.stopImmediatePropagation();
 	});
 	$a.live( "click", function(e) {
@@ -281,10 +281,10 @@ test("live/delegate immediate propagation", function() {
 	$a.trigger( "click" );
 	equals( lastClick, "click1", "live stopImmediatePropagation" );
 	$a.die( "click" );
-	
+
 	lastClick = "";
-	$p.delegate( "a", "click", function(e) { 
-		lastClick = "click1"; 
+	$p.delegate( "a", "click", function(e) {
+		lastClick = "click1";
 		e.stopImmediatePropagation();
 	});
 	$p.delegate( "a", "click", function(e) {
@@ -303,7 +303,7 @@ test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
 			// Use a native click so we don't get jQuery simulated bubbling
 			if ( document.createEvent ) {
 				var e = document.createEvent( "MouseEvents" );
-				e.initEvent( "click", true, true ); 
+				e.initEvent( "click", true, true );
 				$jq[0].dispatchEvent(e);
 			}
 			else if ( $jq[0].click ) {
@@ -333,7 +333,7 @@ test("bind/delegate bubbling, isDefaultPrevented (Bug #7793)", function() {
 test("bind(), iframes", function() {
 	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
 	var doc = jQuery("#loadediframe").contents();
-	
+
 	jQuery("div", doc).bind("click", function() {
 		ok( true, "Binding to element inside iframe" );
 	}).click().unbind('click');
@@ -395,7 +395,7 @@ test("bind(), namespaced events, cloned events", function() {
 
 test("bind(), multi-namespaced events", function() {
 	expect(6);
-	
+
 	var order = [
 		"click.test.abc",
 		"click.test.abc",
@@ -404,7 +404,7 @@ test("bind(), multi-namespaced events", function() {
 		"click.test",
 		"custom.test2"
 	];
-	
+
 	function check(name, msg){
 		same(name, order.shift(), msg);
 	}
@@ -424,7 +424,7 @@ test("bind(), multi-namespaced events", function() {
 	jQuery("#firstp").bind("click.test.abc",function(e){
 		check("click.test.abc", "Namespaced click triggered");
 	});
-	
+
 	// Those would not trigger/unbind (#5303)
 	jQuery("#firstp").trigger("click.a.test");
 	jQuery("#firstp").unbind("click.a.test");
@@ -488,7 +488,7 @@ test("bind(), make sure order is maintained", function() {
 
 	elem.unbind("click");
 });
- 
+
 test("bind(), with different this object", function() {
 	expect(4);
 	var thisObject = { myThis: true },
@@ -500,7 +500,7 @@ test("bind(), with different this object", function() {
 			equals( this, thisObject, "bind() with different this object and data" );
 			equals( event.data, data, "bind() with different this object and data" );
 		};
-	
+
 	jQuery("#firstp")
 		.bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1)
 		.bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2);
@@ -566,29 +566,29 @@ test("bind()/trigger()/unbind() on plain object", function() {
 
 	// Make sure it doesn't complain when no events are found
 	jQuery(obj).unbind("test");
-	
+
 	equals( obj.__events__, undefined, "Make sure events object is removed" );
 });
 
 test("unbind(type)", function() {
 	expect( 0 );
-	
+
 	var $elem = jQuery("#firstp"),
 		message;
 
 	function error(){
 		ok( false, message );
 	}
-	
+
 	message = "unbind passing function";
 	$elem.bind('error1', error).unbind('error1',error).triggerHandler('error1');
-	
+
 	message = "unbind all from event";
 	$elem.bind('error1', error).unbind('error1').triggerHandler('error1');
-	
+
 	message = "unbind all";
 	$elem.bind('error1', error).unbind().triggerHandler('error1');
-	
+
 	message = "unbind many with function";
 	$elem.bind('error1 error2',error)
 		 .unbind('error1 error2', error )
@@ -598,7 +598,7 @@ test("unbind(type)", function() {
 	$elem.bind('error1 error2',error)
 		 .unbind('error1 error2')
 		 .trigger('error1').triggerHandler('error2');
-	
+
 	message = "unbind without a type or handler";
 	$elem.bind("error1 error2.test",error)
 		 .unbind()
@@ -607,7 +607,7 @@ test("unbind(type)", function() {
 
 test("unbind(eventObject)", function() {
 	expect(4);
-	
+
 	var $elem = jQuery("#firstp"),
 		num;
 
@@ -616,7 +616,7 @@ test("unbind(eventObject)", function() {
 		$elem.trigger('foo').triggerHandler('bar');
 		equals( num, expected, "Check the right handlers are triggered" );
 	}
-	
+
 	$elem
 		// This handler shouldn't be unbound
 		.bind('foo', function(){
@@ -630,14 +630,14 @@ test("unbind(eventObject)", function() {
 		.bind('bar', function(){
 			num += 4;
 		});
-		
+
 	assert( 7 );
 	assert( 5 );
-	
+
 	$elem.unbind('bar');
 	assert( 1 );
-	
-	$elem.unbind();	
+
+	$elem.unbind();
 	assert( 0 );
 });
 
@@ -667,25 +667,25 @@ test("trigger() shortcuts", function() {
 		ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
 		return false;
 	}).click();
-	
+
 	jQuery("#check1").click(function() {
 		ok( true, "click event handler for checkbox gets fired twice, see #815" );
 	}).click();
-	
+
 	var counter = 0;
 	jQuery('#firstp')[0].onclick = function(event) {
 		counter++;
 	};
 	jQuery('#firstp').click();
 	equals( counter, 1, "Check that click, triggers onclick event handler also" );
-	
+
 	var clickCounter = 0;
 	jQuery('#simon1')[0].onclick = function(event) {
 		clickCounter++;
 	};
 	jQuery('#simon1').click();
 	equals( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" );
-	
+
 	jQuery('<img />').load(function(){
 		ok( true, "Trigger the load event, using the shortcut .load() (#2819)");
 	}).load();
@@ -763,7 +763,7 @@ test("trigger(type, [data], [fn])", function() {
 		pass = false;
 	}
 	ok( pass, "Trigger focus on hidden element" );
-	
+
 	pass = true;
 	try {
 		jQuery('table:first').bind('test:test', function(){}).trigger('test:test');
@@ -803,28 +803,28 @@ test("jQuery.Event.currentTarget", function(){
 
 test("trigger(eventObject, [data], [fn])", function() {
 	expect(25);
-	
+
 	var $parent = jQuery('<div id="par" />').hide().appendTo('body'),
 		$child = jQuery('<p id="child">foo</p>').appendTo( $parent );
-	
-	var event = jQuery.Event("noNew");	
+
+	var event = jQuery.Event("noNew");
 	ok( event != window, "Instantiate jQuery.Event without the 'new' keyword" );
 	equals( event.type, "noNew", "Verify its type" );
-	
+
 	equals( event.isDefaultPrevented(), false, "Verify isDefaultPrevented" );
 	equals( event.isPropagationStopped(), false, "Verify isPropagationStopped" );
 	equals( event.isImmediatePropagationStopped(), false, "Verify isImmediatePropagationStopped" );
-	
+
 	event.preventDefault();
 	equals( event.isDefaultPrevented(), true, "Verify isDefaultPrevented" );
 	event.stopPropagation();
 	equals( event.isPropagationStopped(), true, "Verify isPropagationStopped" );
-	
+
 	event.isPropagationStopped = function(){ return false };
 	event.stopImmediatePropagation();
 	equals( event.isPropagationStopped(), true, "Verify isPropagationStopped" );
 	equals( event.isImmediatePropagationStopped(), true, "Verify isPropagationStopped" );
-	
+
 	$parent.bind('foo',function(e){
 		// Tries bubbling
 		equals( e.type, 'foo', 'Verify event type when passed passing an event object' );
@@ -832,72 +832,72 @@ test("trigger(eventObject, [data], [fn])", function() {
 		equals( e.currentTarget.id, 'par', 'Verify event.target when passed passing an event object' );
 		equals( e.secret, 'boo!', 'Verify event object\'s custom attribute when passed passing an event object' );
 	});
-	
+
 	// test with an event object
 	event = new jQuery.Event("foo");
 	event.secret = 'boo!';
 	$child.trigger(event);
-	
+
 	// test with a literal object
 	$child.trigger({type:'foo', secret:'boo!'});
-	
+
 	$parent.unbind();
 
 	function error(){
 		ok( false, "This assertion shouldn't be reached");
 	}
-	
+
 	$parent.bind('foo', error );
-	
+
 	$child.bind('foo',function(e, a, b, c ){
 		equals( arguments.length, 4, "Check arguments length");
 		equals( a, 1, "Check first custom argument");
 		equals( b, 2, "Check second custom argument");
 		equals( c, 3, "Check third custom argument");
-		
+
 		equals( e.isDefaultPrevented(), false, "Verify isDefaultPrevented" );
 		equals( e.isPropagationStopped(), false, "Verify isPropagationStopped" );
 		equals( e.isImmediatePropagationStopped(), false, "Verify isImmediatePropagationStopped" );
-		
+
 		// Skips both errors
 		e.stopImmediatePropagation();
-		
+
 		return "result";
 	});
-	
+
 	// We should add this back in when we want to test the order
 	// in which event handlers are iterated.
 	//$child.bind('foo', error );
-	
+
 	event = new jQuery.Event("foo");
 	$child.trigger( event, [1,2,3] ).unbind();
 	equals( event.result, "result", "Check event.result attribute");
-	
+
 	// Will error if it bubbles
 	$child.triggerHandler('foo');
-	
+
 	$child.unbind();
 	$parent.unbind().remove();
 });
 
 test("jQuery.Event.currentTarget", function(){
 	expect(1);
-	
+
 	var counter = 0,
 		$elem = jQuery('<button>a</button>').click(function(e){
 		equals( e.currentTarget, this, "Check currentTarget on "+(counter++?"native":"fake") +" event" );
 	});
-	
+
 	// Fake event
 	$elem.trigger('click');
-	
+
 	// Cleanup
 	$elem.unbind();
 });
 
 test("toggle(Function, Function, ...)", function() {
 	expect(16);
-	
+
 	var count = 0,
 		fn1 = function(e) { count++; },
 		fn2 = function(e) { count--; },
@@ -920,7 +920,7 @@ test("toggle(Function, Function, ...)", function() {
 		});
 		return false;
 	}).click().click().click();
-	
+
 	var turn = 0;
 	var fns = [
 		function(){
@@ -933,7 +933,7 @@ test("toggle(Function, Function, ...)", function() {
 			turn = 3;
 		}
 	];
-	
+
 	var $div = jQuery("<div>&nbsp;</div>").toggle( fns[0], fns[1], fns[2] );
 	$div.click();
 	equals( turn, 1, "Trying toggle with 3 functions, attempt 1 yields 1");
@@ -945,7 +945,7 @@ test("toggle(Function, Function, ...)", function() {
 	equals( turn, 1, "Trying toggle with 3 functions, attempt 4 yields 1");
 	$div.click();
 	equals( turn, 2, "Trying toggle with 3 functions, attempt 5 yields 2");
-	
+
 	$div.unbind('click',fns[0]);
 	var data = jQuery.data( $div[0], 'events' );
 	ok( !data, "Unbinding one function from toggle unbinds them all");
@@ -1087,7 +1087,7 @@ test(".live()/.die()", function() {
 	// Test binding with different this object, event data, and trigger data
 	jQuery("#foo").live("click", true, jQuery.proxy(function(e, data){
 		equals( e.data, true, "live with with different this object, event data, and trigger data" );
-		equals( this.foo, "bar", "live with with different this object, event data, and trigger data" ); 
+		equals( this.foo, "bar", "live with with different this object, event data, and trigger data" );
 		equals( data, true, "live with with different this object, event data, and trigger data")
 	}, { foo: "bar" }));
 	jQuery("#foo").trigger("click", true).die("click");
@@ -1148,25 +1148,25 @@ test(".live()/.die()", function() {
 
 	// Cleanup
 	jQuery("#nothiddendiv").die("foo", callback);
-	
+
 	// Make sure we don't loose the target by DOM modifications
 	// after the bubble already reached the liveHandler
 	var livec = 0, elemDiv = jQuery("#nothiddendivchild").html('<span></span>').get(0);
-	
+
 	jQuery("#nothiddendivchild").live("click", function(e){ jQuery("#nothiddendivchild").html(''); });
 	jQuery("#nothiddendivchild").live("click", function(e){ if(e.target) {livec++;} });
-	
+
 	jQuery("#nothiddendiv span").click();
 	equals( jQuery("#nothiddendiv span").length, 0, "Verify that first handler occurred and modified the DOM." );
 	equals( livec, 1, "Verify that second handler occurred even with nuked target." );
-	
+
 	// Cleanup
 	jQuery("#nothiddendivchild").die("click");
 
 	// Verify that .live() ocurs and cancel buble in the same order as
 	// we would expect .bind() and .click() without delegation
 	var lived = 0, livee = 0;
-	
+
 	// bind one pair in one order
 	jQuery('span#liveSpan1 a').live('click', function(){ lived++; return false; });
 	jQuery('span#liveSpan1').live('click', function(){ livee++; });
@@ -1184,22 +1184,22 @@ test(".live()/.die()", function() {
 	jQuery('span#liveSpan2 a').click();
 	equals( lived, 1, "Verify that only one first handler occurred." );
 	equals( livee, 0, "Verify that second handler doesn't." );
-	
+
 	// Cleanup
 	jQuery("span#liveSpan1 a").die("click")
 	jQuery("span#liveSpan1").die("click");
 	jQuery("span#liveSpan2 a").die("click");
 	jQuery("span#liveSpan2").die("click");
-	
+
 	// Test this, target and currentTarget are correct
-	jQuery('span#liveSpan1').live('click', function(e){ 
+	jQuery('span#liveSpan1').live('click', function(e){
 		equals( this.id, 'liveSpan1', 'Check the this within a live handler' );
 		equals( e.currentTarget.id, 'liveSpan1', 'Check the event.currentTarget within a live handler' );
 		equals( e.target.nodeName.toUpperCase(), 'A', 'Check the event.target within a live handler' );
 	});
-	
+
 	jQuery('span#liveSpan1 a').click();
-	
+
 	jQuery('span#liveSpan1').die('click');
 
 	// Work with deep selectors
@@ -1333,18 +1333,18 @@ test("live with change", function(){
 	expect(8);
 
 	var selectChange = 0, checkboxChange = 0;
-	
+
 	var select = jQuery("select[name='S1']")
 	select.live("change", function() {
 		selectChange++;
 	});
-	
-	var checkbox = jQuery("#check2"), 
+
+	var checkbox = jQuery("#check2"),
 		checkboxFunction = function(){
 			checkboxChange++;
 		}
 	checkbox.live("change", checkboxFunction);
-	
+
 	// test click on select
 
 	// second click that changed it
@@ -1352,17 +1352,17 @@ test("live with change", function(){
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 1, "Change on click." );
-	
+
 	// test keys on select
 	selectChange = 0;
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 1, "Change on keyup." );
-	
+
 	// test click on checkbox
 	checkbox.trigger("change");
 	equals( checkboxChange, 1, "Change on checkbox." );
-	
+
 	// test blur/focus on text
 	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
 	text.live("change", function() {
@@ -1375,7 +1375,7 @@ test("live with change", function(){
 
 	text.val(oldTextVal);
 	text.die("change");
-	
+
 	// test blur/focus on password
 	var password = jQuery("#name"), passwordChange = 0, oldPasswordVal = password.val();
 	password.live("change", function() {
@@ -1388,9 +1388,9 @@ test("live with change", function(){
 
 	password.val(oldPasswordVal);
 	password.die("change");
-	
+
 	// make sure die works
-	
+
 	// die all changes
 	selectChange = 0;
 	select.die("change");
@@ -1402,7 +1402,7 @@ test("live with change", function(){
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 0, "Die on keyup works." );
-	
+
 	// die specific checkbox
 	checkbox.die("change", checkboxFunction);
 	checkbox.trigger("change");
@@ -1411,7 +1411,7 @@ test("live with change", function(){
 
 test("live with submit", function() {
 	var count1 = 0, count2 = 0;
-	
+
 	jQuery("#testForm").live("submit", function(ev) {
 		count1++;
 		ev.preventDefault();
@@ -1425,7 +1425,7 @@ test("live with submit", function() {
 	jQuery("#testForm input[name=sub1]").submit();
 	equals( count1, 1, "Verify form submit." );
 	equals( count2, 1, "Verify body submit." );
-	
+
 	jQuery("#testForm").die("submit");
 	jQuery("body").die("submit");
 });
@@ -1603,7 +1603,7 @@ test(".delegate()/.undelegate()", function() {
 	// Test binding with different this object, event data, and trigger data
 	jQuery("#body").delegate("#foo", "click", true, jQuery.proxy(function(e, data){
 		equals( e.data, true, "delegate with with different this object, event data, and trigger data" );
-		equals( this.foo, "bar", "delegate with with different this object, event data, and trigger data" ); 
+		equals( this.foo, "bar", "delegate with with different this object, event data, and trigger data" );
 		equals( data, true, "delegate with with different this object, event data, and trigger data")
 	}, { foo: "bar" }));
 	jQuery("#foo").trigger("click", true);
@@ -1665,25 +1665,25 @@ test(".delegate()/.undelegate()", function() {
 
 	// Cleanup
 	jQuery("#body").undelegate("#nothiddendiv", "foo", callback);
-	
+
 	// Make sure we don't loose the target by DOM modifications
 	// after the bubble already reached the liveHandler
 	var livec = 0, elemDiv = jQuery("#nothiddendivchild").html('<span></span>').get(0);
-	
+
 	jQuery("#body").delegate("#nothiddendivchild", "click", function(e){ jQuery("#nothiddendivchild").html(''); });
 	jQuery("#body").delegate("#nothiddendivchild", "click", function(e){ if(e.target) {livec++;} });
-	
+
 	jQuery("#nothiddendiv span").click();
 	equals( jQuery("#nothiddendiv span").length, 0, "Verify that first handler occurred and modified the DOM." );
 	equals( livec, 1, "Verify that second handler occurred even with nuked target." );
-	
+
 	// Cleanup
 	jQuery("#body").undelegate("#nothiddendivchild", "click");
 
 	// Verify that .live() ocurs and cancel buble in the same order as
 	// we would expect .bind() and .click() without delegation
 	var lived = 0, livee = 0;
-	
+
 	// bind one pair in one order
 	jQuery("#body").delegate('span#liveSpan1 a', 'click', function(){ lived++; return false; });
 	jQuery("#body").delegate('span#liveSpan1', 'click', function(){ livee++; });
@@ -1701,19 +1701,19 @@ test(".delegate()/.undelegate()", function() {
 	jQuery('span#liveSpan2 a').click();
 	equals( lived, 1, "Verify that only one first handler occurred." );
 	equals( livee, 0, "Verify that second handler doesn't." );
-	
+
 	// Cleanup
 	jQuery("#body").undelegate("click");
-	
+
 	// Test this, target and currentTarget are correct
-	jQuery("#body").delegate('span#liveSpan1', 'click', function(e){ 
+	jQuery("#body").delegate('span#liveSpan1', 'click', function(e){
 		equals( this.id, 'liveSpan1', 'Check the this within a delegate handler' );
 		equals( e.currentTarget.id, 'liveSpan1', 'Check the event.currentTarget within a delegate handler' );
 		equals( e.target.nodeName.toUpperCase(), 'A', 'Check the event.target within a delegate handler' );
 	});
-	
+
 	jQuery('span#liveSpan1 a').click();
-	
+
 	jQuery("#body").undelegate('span#liveSpan1', 'click');
 
 	// Work with deep selectors
@@ -1789,18 +1789,18 @@ test("delegate with change", function(){
 	expect(8);
 
 	var selectChange = 0, checkboxChange = 0;
-	
+
 	var select = jQuery("select[name='S1']");
 	jQuery("#body").delegate("select[name='S1']", "change", function() {
 		selectChange++;
 	});
-	
-	var checkbox = jQuery("#check2"), 
+
+	var checkbox = jQuery("#check2"),
 		checkboxFunction = function(){
 			checkboxChange++;
 		}
 	jQuery("#body").delegate("#check2", "change", checkboxFunction);
-	
+
 	// test click on select
 
 	// second click that changed it
@@ -1808,17 +1808,17 @@ test("delegate with change", function(){
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 1, "Change on click." );
-	
+
 	// test keys on select
 	selectChange = 0;
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 1, "Change on keyup." );
-	
+
 	// test click on checkbox
 	checkbox.trigger("change");
 	equals( checkboxChange, 1, "Change on checkbox." );
-	
+
 	// test blur/focus on text
 	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
 	jQuery("#body").delegate("#name", "change", function() {
@@ -1831,7 +1831,7 @@ test("delegate with change", function(){
 
 	text.val(oldTextVal);
 	jQuery("#body").die("change");
-	
+
 	// test blur/focus on password
 	var password = jQuery("#name"), passwordChange = 0, oldPasswordVal = password.val();
 	jQuery("#body").delegate("#name", "change", function() {
@@ -1844,9 +1844,9 @@ test("delegate with change", function(){
 
 	password.val(oldPasswordVal);
 	jQuery("#body").undelegate("#name", "change");
-	
+
 	// make sure die works
-	
+
 	// die all changes
 	selectChange = 0;
 	jQuery("#body").undelegate("select[name='S1']", "change");
@@ -1858,7 +1858,7 @@ test("delegate with change", function(){
 	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
 	select.trigger("change");
 	equals( selectChange, 0, "Die on keyup works." );
-	
+
 	// die specific checkbox
 	jQuery("#body").undelegate("#check2", "change", checkboxFunction);
 	checkbox.trigger("change");
@@ -1867,7 +1867,7 @@ test("delegate with change", function(){
 
 test("delegate with submit", function() {
 	var count1 = 0, count2 = 0;
-	
+
 	jQuery("#body").delegate("#testForm", "submit", function(ev) {
 		count1++;
 		ev.preventDefault();
@@ -1881,7 +1881,7 @@ test("delegate with submit", function() {
 	jQuery("#testForm input[name=sub1]").submit();
 	equals( count1, 1, "Verify form submit." );
 	equals( count2, 1, "Verify body submit." );
-	
+
 	jQuery("#body").undelegate();
 	jQuery(document).undelegate();
 });
diff --git a/test/unit/offset.js b/test/unit/offset.js
index 879753181..cfa14449b 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -13,9 +13,9 @@ var supportsScroll = false;
 
 testoffset("absolute"/* in iframe */, function($, iframe) {
 	expect(4);
-	
+
 	var doc = iframe.document, tests;
-	
+
 	// force a scroll value on the main window
 	// this insures that the results will be wrong
 	// if the offset method is using the scroll offset
@@ -28,7 +28,7 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
 	}
 
 	window.scrollTo(1, 1);
-	
+
 	// get offset
 	tests = [
 		{ id: '#absolute-1', top: 1, left: 1 }
@@ -47,16 +47,16 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
 		equals( jQuery( this.id, doc ).position().top,  this.top,  "jQuery('" + this.id + "').position().top" );
 		equals( jQuery( this.id, doc ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
 	});
-	
+
 	forceScroll.remove();
 });
 
 testoffset("absolute", function( jQuery ) {
 	expect(178);
-	
+
 	// get offset tests
 	var tests = [
-		{ id: '#absolute-1',     top:  1, left:  1 }, 
+		{ id: '#absolute-1',     top:  1, left:  1 },
 		{ id: '#absolute-1-1',   top:  5, left:  5 },
 		{ id: '#absolute-1-1-1', top:  9, left:  9 },
 		{ id: '#absolute-2',     top: 20, left: 20 }
@@ -65,8 +65,8 @@ testoffset("absolute", function( jQuery ) {
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
 	});
-	
-	
+
+
 	// get position
 	tests = [
 		{ id: '#absolute-1',     top:  0, left:  0 },
@@ -78,13 +78,13 @@ testoffset("absolute", function( jQuery ) {
 		equals( jQuery( this.id ).position().top,  this.top,  "jQuery('" + this.id + "').position().top" );
 		equals( jQuery( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
 	});
-	
+
 	// test #5781
 	var offset = jQuery( '#positionTest' ).offset({ top: 10, left: 10 }).offset();
 	equals( offset.top,  10, "Setting offset on element with position absolute but 'auto' values." )
 	equals( offset.left, 10, "Setting offset on element with position absolute but 'auto' values." )
-	
-	
+
+
 	// set offset
 	tests = [
 		{ id: '#absolute-2',     top: 30, left: 30 },
@@ -108,9 +108,9 @@ testoffset("absolute", function( jQuery ) {
 		jQuery( this.id ).offset({ top: this.top, left: this.left });
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
-		
+
 		var top = this.top, left = this.left;
-		
+
 		jQuery( this.id ).offset(function(i, val){
 			equals( val.top, top, "Verify incoming top position." );
 			equals( val.left, left, "Verify incoming top position." );
@@ -118,13 +118,13 @@ testoffset("absolute", function( jQuery ) {
 		});
 		equals( jQuery( this.id ).offset().top,  this.top  + 1, "jQuery('" + this.id + "').offset({ top: "  + (this.top  + 1) + " })" );
 		equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + (this.left + 1) + " })" );
-		
+
 		jQuery( this.id )
 			.offset({ left: this.left + 2 })
 			.offset({ top:  this.top  + 2 });
 		equals( jQuery( this.id ).offset().top,  this.top  + 2, "Setting one property at a time." );
 		equals( jQuery( this.id ).offset().left, this.left + 2, "Setting one property at a time." );
-		
+
 		jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
 			jQuery( this ).css({
 				top:  props.top  + 1,
@@ -138,10 +138,10 @@ testoffset("absolute", function( jQuery ) {
 
 testoffset("relative", function( jQuery ) {
 	expect(60);
-	
+
 	// IE is collapsing the top margin of 1px
 	var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
-	
+
 	// get offset
 	var tests = [
 		{ id: '#relative-1',   top: ie ?   6 :   7, left:  7 },
@@ -152,8 +152,8 @@ testoffset("relative", function( jQuery ) {
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
 	});
-	
-	
+
+
 	// get position
 	tests = [
 		{ id: '#relative-1',   top: ie ?   5 :   6, left:  6 },
@@ -164,8 +164,8 @@ testoffset("relative", function( jQuery ) {
 		equals( jQuery( this.id ).position().top,  this.top,  "jQuery('" + this.id + "').position().top" );
 		equals( jQuery( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
 	});
-	
-	
+
+
 	// set offset
 	tests = [
 		{ id: '#relative-2',   top: 200, left:  50 },
@@ -185,7 +185,7 @@ testoffset("relative", function( jQuery ) {
 		jQuery( this.id ).offset({ top: this.top, left: this.left });
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
-		
+
 		jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
 			jQuery( this ).css({
 				top:  props.top  + 1,
@@ -199,10 +199,10 @@ testoffset("relative", function( jQuery ) {
 
 testoffset("static", function( jQuery ) {
 	expect(80);
-	
+
 	// IE is collapsing the top margin of 1px
 	var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
-	
+
 	// get offset
 	var tests = [
 		{ id: '#static-1',     top: ie ?   6 :   7, left:  7 },
@@ -214,8 +214,8 @@ testoffset("static", function( jQuery ) {
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
 	});
-	
-	
+
+
 	// get position
 	tests = [
 		{ id: '#static-1',     top: ie ?   5 :   6, left:  6 },
@@ -227,8 +227,8 @@ testoffset("static", function( jQuery ) {
 		equals( jQuery( this.id ).position().top,  this.top,  "jQuery('" + this.top  + "').position().top" );
 		equals( jQuery( this.id ).position().left, this.left, "jQuery('" + this.left +"').position().left" );
 	});
-	
-	
+
+
 	// set offset
 	tests = [
 		{ id: '#static-2',     top: 200, left: 200 },
@@ -252,7 +252,7 @@ testoffset("static", function( jQuery ) {
 		jQuery( this.id ).offset({ top: this.top, left: this.left });
 		equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
 		equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
-		
+
 		jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
 			jQuery( this ).css({
 				top:  props.top  + 1,
@@ -266,9 +266,9 @@ testoffset("static", function( jQuery ) {
 
 testoffset("fixed", function( jQuery ) {
 	expect(28);
-	
+
 	jQuery.offset.initialize();
-	
+
 	var tests = [
 		{ id: '#fixed-1', top: 1001, left: 1001 },
 		{ id: '#fixed-2', top: 1021, left: 1021 }
@@ -288,7 +288,7 @@ testoffset("fixed", function( jQuery ) {
 			ok( true, 'Fixed position is not supported' );
 		}
 	});
-	
+
 	tests = [
 		{ id: '#fixed-1', top: 100, left: 100 },
 		{ id: '#fixed-1', top:   0, left:   0 },
@@ -297,13 +297,13 @@ testoffset("fixed", function( jQuery ) {
 		{ id: '#fixed-2', top:   0, left:   0 },
 		{ id: '#fixed-2', top:  -5, left:  -5 }
 	];
-	
+
 	jQuery.each( tests, function() {
 		if ( jQuery.offset.supportsFixedPosition ) {
 			jQuery( this.id ).offset({ top: this.top, left: this.left });
 			equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
 			equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
-		
+
 			jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
 				jQuery( this ).css({
 					top:  props.top  + 1,
@@ -324,38 +324,38 @@ testoffset("fixed", function( jQuery ) {
 
 testoffset("table", function( jQuery ) {
 	expect(4);
-	
+
 	equals( jQuery('#table-1').offset().top, 6, "jQuery('#table-1').offset().top" );
 	equals( jQuery('#table-1').offset().left, 6, "jQuery('#table-1').offset().left" );
-	
+
 	equals( jQuery('#th-1').offset().top, 10, "jQuery('#th-1').offset().top" );
 	equals( jQuery('#th-1').offset().left, 10, "jQuery('#th-1').offset().left" );
 });
 
 testoffset("scroll", function( jQuery, win ) {
 	expect(16);
-	
+
 	var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
-	
+
 	// IE is collapsing the top margin of 1px
 	equals( jQuery('#scroll-1').offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
 	equals( jQuery('#scroll-1').offset().left, 7, "jQuery('#scroll-1').offset().left" );
-	
+
 	// IE is collapsing the top margin of 1px
 	equals( jQuery('#scroll-1-1').offset().top, ie ? 9 : 11, "jQuery('#scroll-1-1').offset().top" );
 	equals( jQuery('#scroll-1-1').offset().left, 11, "jQuery('#scroll-1-1').offset().left" );
-	
-	
+
+
 	// scroll offset tests .scrollTop/Left
 	equals( jQuery('#scroll-1').scrollTop(), 5, "jQuery('#scroll-1').scrollTop()" );
 	equals( jQuery('#scroll-1').scrollLeft(), 5, "jQuery('#scroll-1').scrollLeft()" );
-	
+
 	equals( jQuery('#scroll-1-1').scrollTop(), 0, "jQuery('#scroll-1-1').scrollTop()" );
 	equals( jQuery('#scroll-1-1').scrollLeft(), 0, "jQuery('#scroll-1-1').scrollLeft()" );
-	
+
 	// equals( jQuery('body').scrollTop(), 0, "jQuery('body').scrollTop()" );
 	// equals( jQuery('body').scrollLeft(), 0, "jQuery('body').scrollTop()" );
-	
+
 	win.name = "test";
 
 	if ( !supportsScroll ) {
@@ -367,11 +367,11 @@ testoffset("scroll", function( jQuery, win ) {
 	} else {
 		equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
 		equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
-	
+
 		equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
 		equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
 	}
-	
+
 	// test jQuery using parent window/document
 	// jQuery reference here is in the iframe
 	window.scrollTo(0,0);
@@ -383,7 +383,7 @@ testoffset("scroll", function( jQuery, win ) {
 
 testoffset("body", function( jQuery ) {
 	expect(2);
-	
+
 	equals( jQuery('body').offset().top, 1, "jQuery('#body').offset().top" );
 	equals( jQuery('body').offset().left, 1, "jQuery('#body').offset().left" );
 });
@@ -423,11 +423,11 @@ test("offsetParent", function(){
 });
 
 function testoffset(name, fn) {
-	
+
 	test(name, function() {
 		// pause execution for now
 		stop();
-		
+
 		// load fixture in iframe
 		var iframe = loadFixture(),
 			win = iframe.contentWindow,
@@ -443,7 +443,7 @@ function testoffset(name, fn) {
 				}
 			}, 15 );
 	});
-	
+
 	function loadFixture() {
 		var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000, 10 ),
 			iframe = jQuery('<iframe />').css({
diff --git a/test/unit/queue.js b/test/unit/queue.js
index 79b753c11..eada0eede 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -3,9 +3,9 @@ module("queue");
 test("queue() with other types",function() {
 	expect(9);
 	var counter = 0;
-	
+
 	var $div = jQuery({});
-	
+
 	$div
 		.queue('foo',function(){
 			equals( ++counter, 1, "Dequeuing" );
@@ -21,26 +21,26 @@ test("queue() with other types",function() {
 		.queue('foo',function(){
 			equals( ++counter, 4, "Dequeuing" );
 		});
-		
+
 	equals( $div.queue('foo').length, 4, "Testing queue length" );
-	
+
 	$div.dequeue('foo');
-	
+
 	equals( counter, 3, "Testing previous call to dequeue" );
 	equals( $div.queue('foo').length, 1, "Testing queue length" );
-	
+
 	$div.dequeue('foo');
-	
+
 	equals( counter, 4, "Testing previous call to dequeue" );
 	equals( $div.queue('foo').length, 0, "Testing queue length" );
 });
 
 test("queue(name) passes in the next item in the queue as a parameter", function() {
 	expect(2);
-	
+
 	var div = jQuery({});
 	var counter = 0;
-	
+
 	div.queue("foo", function(next) {
 		equals(++counter, 1, "Dequeueing");
 		next();
@@ -50,16 +50,16 @@ test("queue(name) passes in the next item in the queue as a parameter", function
 	}).queue("bar", function() {
 		equals(++counter, 3, "Other queues are not triggered by next()")
 	});
-	
+
 	div.dequeue("foo");
 });
 
 test("queue(name) passes in the next item in the queue as a parameter", function() {
 	expect(2);
-	
+
 	var div = jQuery({});
 	var counter = 0;
-	
+
 	div.queue("foo", function(next) {
 		equals(++counter, 1, "Dequeueing");
 		next();
@@ -69,17 +69,17 @@ test("queue(name) passes in the next item in the queue as a parameter", function
 	}).queue("bar", function() {
 		equals(++counter, 3, "Other queues are not triggered by next()")
 	});
-	
+
 	div.dequeue("foo");
 });
 
 test("queue() passes in the next item in the queue as a parameter to fx queues", function() {
 	expect(2);
 	stop();
-	
+
 	var div = jQuery({});
 	var counter = 0;
-	
+
 	div.queue(function(next) {
 		equals(++counter, 1, "Dequeueing");
 		var self = this;
@@ -111,10 +111,10 @@ test("delay()", function() {
 
 test("clearQueue(name) clears the queue", function() {
 	expect(1);
-	
+
 	var div = jQuery({});
 	var counter = 0;
-	
+
 	div.queue("foo", function(next) {
 		counter++;
 		jQuery(this).clearQueue("foo");
@@ -122,18 +122,18 @@ test("clearQueue(name) clears the queue", function() {
 	}).queue("foo", function(next) {
 		counter++;
 	});
-	
+
 	div.dequeue("foo");
-	
+
 	equals(counter, 1, "the queue was cleared");
 });
 
 test("clearQueue() clears the fx queue", function() {
 	expect(1);
-	
+
 	var div = jQuery({});
 	var counter = 0;
-	
+
 	div.queue(function(next) {
 		counter++;
 		var self = this;
@@ -141,8 +141,8 @@ test("clearQueue() clears the fx queue", function() {
 	}).queue(function(next) {
 		counter++;
 	});
-	
+
 	equals(counter, 1, "the queue was cleared");
-	
+
 	div.removeData();
 });
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 6ec20bc40..5b758c101 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -22,7 +22,7 @@ test("element", function() {
 	same( jQuery("div").find("p").get(), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." );
 
 	same( jQuery("#form").find("select").get(), q("select1","select2","select3","select4","select5"), "Finding selects with a context." );
-	
+
 	ok( jQuery("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
 	ok( jQuery("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
 
@@ -68,7 +68,7 @@ test("broken", function() {
 				name + ": " + selector );
 		}
 	}
-	
+
 	broken( "Broken Selector", "[", [] );
 	broken( "Broken Selector", "(", [] );
 	broken( "Broken Selector", "{", [] );
@@ -90,28 +90,28 @@ test("id", function() {
 	t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", ["台北Táiběi","台北"] );
 	t( "Descendant ID selector using UTF8", "div #台北", ["台北"] );
 	t( "Child ID selector using UTF8", "form > #台北", ["台北"] );
-	
+
 	t( "Escaped ID", "#foo\\:bar", ["foo:bar"] );
 	t( "Escaped ID", "#test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
 	t( "Descendant escaped ID", "div #foo\\:bar", ["foo:bar"] );
 	t( "Descendant escaped ID", "div #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
 	t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] );
 	t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-	
+
 	t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] ); // bug #267
 	t( "ID Selector, not an ancestor ID", "#form #first", [] );
 	t( "ID Selector, not a child ID", "#form > #option1a", [] );
-	
+
 	t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
 	t( "All Children of ID with no children", "#firstUL > *", [] );
-	
+
 	var a = jQuery('<div><a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div></div>').appendTo('#main');
 	equals( jQuery("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
 	equals( jQuery("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" );
 	a.remove();
 
 	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
-	
+
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
 
 	same( jQuery("body").find("div#form").get(), [], "ID selector within the context of another element" );
@@ -134,7 +134,7 @@ test("class", function() {
 	same( jQuery(".blog", "p").get(), q("mark", "simon"), "Finding elements with a context." );
 	same( jQuery(".blog", jQuery("p")).get(), q("mark", "simon"), "Finding elements with a context." );
 	same( jQuery("p").find(".blog").get(), q("mark", "simon"), "Finding elements with a context." );
-	
+
 	t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] );
 	//t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] );
 	t( "Class selector using UTF8", ".台北Táiběi.台北", ["utf8class1"] );
@@ -194,7 +194,7 @@ test("name", function() {
 
 test("multiple", function() {
 	expect(4);
-	
+
 	t( "Comma Support", "h2, p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"]);
 	t( "Comma Support", "h2 , p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"]);
 	t( "Comma Support", "h2 , p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"]);
@@ -242,7 +242,7 @@ test("attributes", function() {
 	t( "Attribute Exists", "*[title]", ["google"] );
 	t( "Attribute Exists", "[title]", ["google"] );
 	t( "Attribute Exists", "a[ title ]", ["google"] );
-	
+
 	t( "Attribute Equals", "a[rel='bookmark']", ["simon1"] );
 	t( "Attribute Equals", 'a[rel="bookmark"]', ["simon1"] );
 	t( "Attribute Equals", "a[rel=bookmark]", ["simon1"] );
@@ -263,13 +263,13 @@ test("attributes", function() {
 	t( "Attribute containing []", "input[name$='[bar]']", ["hidden2"] );
 	t( "Attribute containing []", "input[name$='foo[bar]']", ["hidden2"] );
 	t( "Attribute containing []", "input[name*='foo[bar]']", ["hidden2"] );
-	
+
 	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type='hidden']", ["radio1", "radio2", "hidden1"] );
 	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=\"hidden\"]", ["radio1", "radio2", "hidden1"] );
 	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=hidden]", ["radio1", "radio2", "hidden1"] );
-	
+
 	t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );
-	
+
 	t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
 	t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
 	t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
@@ -288,11 +288,11 @@ test("attributes", function() {
 
 	t("Empty values", "#select1 option[value='']", ["option1a"]);
 	t("Empty values", "#select1 option[value!='']", ["option1b","option1c","option1d"]);
-	
+
 	t("Select options via :selected", "#select1 option:selected", ["option1a"] );
 	t("Select options via :selected", "#select2 option:selected", ["option2d"] );
 	t("Select options via :selected", "#select3 option:selected", ["option3b", "option3c"] );
-	
+
 	t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
 });
 
@@ -315,10 +315,10 @@ test("pseudo - child", function() {
 	t( "First Child", "p:first-child", [] );
 
 	QUnit.reset();
-	
+
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Last Child", "#main a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon","liveLink1","liveLink2"] );
-	
+
 	t( "Nth-child", "#main form#form > *:nth-child(2)", ["text1"] );
 	t( "Nth-child", "#main form#form > :nth-child(2)", ["text1"] );
 
@@ -347,7 +347,7 @@ test("pseudo - misc", function() {
 
 	t( "Headers", ":header", ["qunit-header", "qunit-banner", "qunit-userAgent"] );
 	t( "Has Children - :has()", "p:has(a)", ["firstp","ap","en","sap"] );
-	
+
 	var select = document.getElementById("select1");
 	ok( (window.Sizzle || window.jQuery.find).matchesSelector( select, ":has(option)" ), "Has Option Matches" );
 
@@ -393,7 +393,7 @@ test("pseudo - :not", function() {
 	t( ":not() Multiple Class", "#foo a:not(.blog.link)", ["yahoo","anchor2"] );
 });
 
-test("pseudo - position", function() {	
+test("pseudo - position", function() {
 	expect(25);
 	t( "nth Element", "p:nth(1)", ["ap"] );
 	t( "First Element", "p:first", ["firstp"] );
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 0d079f19a..31cffc2eb 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -138,7 +138,7 @@ test("closest()", function() {
 	same( jq.closest("html", document.body).get(), [], "Context limited." );
 	same( jq.closest("body", document.body).get(), [], "Context limited." );
 	same( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." );
-	
+
 	//Test that .closest() returns unique'd set
 	equals( jQuery('#main p').closest('#main').length, 1, "Closest should return a unique set" );
 
@@ -275,9 +275,9 @@ test("parents([String])", function() {
 
 test("parentsUntil([String])", function() {
 	expect(9);
-	
+
 	var parents = jQuery("#groups").parents();
-	
+
 	same( jQuery("#groups").parentsUntil().get(), parents.get(), "parentsUntil with no selector (nextAll)" );
 	same( jQuery("#groups").parentsUntil(".foo").get(), parents.get(), "parentsUntil with invalid selector (nextAll)" );
 	same( jQuery("#groups").parentsUntil("#html").get(), parents.not(':last').get(), "Simple parentsUntil check" );
@@ -307,9 +307,9 @@ test("prev([String])", function() {
 
 test("nextAll([String])", function() {
 	expect(4);
-	
+
 	var elems = jQuery('#form').children();
-	
+
 	same( jQuery("#label-for").nextAll().get(), elems.not(':first').get(), "Simple nextAll check" );
 	same( jQuery("#label-for").nextAll('input').get(), elems.not(':first').filter('input').get(), "Filtered nextAll check" );
 	same( jQuery("#label-for").nextAll('input,select').get(), elems.not(':first').filter('input,select').get(), "Multiple-filtered nextAll check" );
@@ -318,9 +318,9 @@ test("nextAll([String])", function() {
 
 test("prevAll([String])", function() {
 	expect(4);
-	
+
 	var elems = jQuery( jQuery('#form').children().slice(0, 12).get().reverse() );
-	
+
 	same( jQuery("#area1").prevAll().get(), elems.get(), "Simple prevAll check" );
 	same( jQuery("#area1").prevAll('input').get(), elems.filter('input').get(), "Filtered prevAll check" );
 	same( jQuery("#area1").prevAll('input,select').get(), elems.filter('input,select').get(), "Multiple-filtered prevAll check" );
@@ -329,9 +329,9 @@ test("prevAll([String])", function() {
 
 test("nextUntil([String])", function() {
 	expect(11);
-	
+
 	var elems = jQuery('#form').children().slice( 2, 12 );
-	
+
 	same( jQuery("#text1").nextUntil().get(), jQuery("#text1").nextAll().get(), "nextUntil with no selector (nextAll)" );
 	same( jQuery("#text1").nextUntil(".foo").get(), jQuery("#text1").nextAll().get(), "nextUntil with invalid selector (nextAll)" );
 	same( jQuery("#text1").nextUntil("#area1").get(), elems.get(), "Simple nextUntil check" );
@@ -342,15 +342,15 @@ test("nextUntil([String])", function() {
 	same( jQuery("#text1").nextUntil("#area1", "button,input").get(), elems.get(), "Multiple-filtered nextUntil check" );
 	equals( jQuery("#text1").nextUntil("#area1", "div").length, 0, "Filtered nextUntil check, no match" );
 	same( jQuery("#text1, #hidden1").nextUntil("#area1", "button,input").get(), elems.get(), "Multi-source, multiple-filtered nextUntil check" );
-	
+
 	same( jQuery("#text1").nextUntil("[class=foo]").get(), jQuery("#text1").nextAll().get(), "Non-element nodes must be skipped, since they have no attributes" );
 });
 
 test("prevUntil([String])", function() {
 	expect(10);
-	
+
 	var elems = jQuery("#area1").prevAll();
-	
+
 	same( jQuery("#area1").prevUntil().get(), elems.get(), "prevUntil with no selector (prevAll)" );
 	same( jQuery("#area1").prevUntil(".foo").get(), elems.get(), "prevUntil with invalid selector (prevAll)" );
 	same( jQuery("#area1").prevUntil("label").get(), elems.not(':last').get(), "Simple prevUntil check" );

From 4eeae8b0bc789ad525e98568cffb37b04b27ae84 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Thu, 30 Dec 2010 01:16:39 -0600
Subject: [PATCH 045/110] Remove patch for very early versions of Opera 9 that
 made it impossible to animate values smaller than -10000. Fixes #7193. Thanks
 to igorw for initial patch & test case.

---
 src/effects.js       |  2 +-
 test/unit/effects.js | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/effects.js b/src/effects.js
index 5f3a035fc..bd57ffc3d 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -337,7 +337,7 @@ jQuery.fx.prototype = {
 		}
 
 		var r = parseFloat( jQuery.css( this.elem, this.prop ) );
-		return r && r > -10000 ? r : 0;
+		return r || 0;
 	},
 
 	// Start an animation from one number to another
diff --git a/test/unit/effects.js b/test/unit/effects.js
index e96f6b6f0..b7b60abbe 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -560,6 +560,23 @@ jQuery.checkOverflowDisplay = function(){
 	start();
 }
 
+test("support negative values < -10000 (bug #7193)", function () {
+	expect(1);
+	stop();
+
+	jQuery.extend(jQuery.fx.step, {
+		"marginBottom": function(fx) {
+			equals( fx.cur(), -11000, "Element has margin-bottom of -11000" );
+			delete jQuery.fx.step.marginBottom;
+		}
+    });
+
+	jQuery("#main").css("marginBottom", "-11000px").animate({ marginBottom: "-11001px" }, {
+		duration: 1,
+		complete: start
+	});
+});
+
 test("JS Overflow and Display", function() {
 	expect(2);
 	stop();

From c1625f6b79b2693ea85f2c16349f708ff203773b Mon Sep 17 00:00:00 2001
From: Jonas Pfenniger <jonas@pfenniger.name>
Date: Thu, 30 Dec 2010 01:38:28 -0600
Subject: [PATCH 046/110] Update Rakefile to remove module wrappers (feature
 parity with make and ant). Update Makefile to avoid rebuilding jquery.js when
 it is not necessary to do so.

---
 Makefile |  2 +-
 Rakefile | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6f2281754..5792bb478 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ init:
 jquery: ${JQ}
 jq: ${JQ}
 
-${JQ}: ${MODULES} ${DIST_DIR}
+${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}
 
 	@@cat ${MODULES} | \
diff --git a/Rakefile b/Rakefile
index 4319aa769..52d789952 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,28 @@ test_dir  = File.join( prefix, 'test' )
 # setting DIST_DIR before calling rake
 dist_dir  = ENV['DIST_DIR'] || File.join( prefix, 'dist' )
 
-base_files = %w{intro core support data queue attributes event selector traversing manipulation css ajax xhr transports/jsonp transports/script transports/xhr effects offset dimensions outro}.map { |js| File.join( src_dir, "#{js}.js" ) }
+base_files = %w{
+  intro
+  core
+  support
+  data
+  queue
+  attributes
+  event
+  selector
+  traversing
+  manipulation
+  css
+  ajax
+  xhr
+  transports/jsonp
+  transports/script
+  transports/xhr
+  effects
+  offset
+  dimensions
+  outro
+}.map { |js| File.join( src_dir, "#{js}.js" ) }
 
 # Sizzle, QUnit and jQuery files/dirs
 sizzle_dir = File.join( src_dir, "sizzle" )
@@ -89,7 +110,11 @@ file jq => [dist_dir, base_files].flatten do
   puts "Building jquery.js..."
 
   File.open(jq, 'w') do |f|
-    f.write cat(base_files).gsub(/@DATE/, date).gsub(/@VERSION/, version)
+    f.write cat(base_files).
+      gsub(/@DATE/, date).
+      gsub(/@VERSION/, version).
+      gsub(/.function..jQuery...\{/, '').
+      gsub(/\}...jQuery..;/, '')
   end
 end
 

From 7b1e873cd9656ab9184242cba708faecd5f46c3d Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 30 Dec 2010 17:06:53 +0100
Subject: [PATCH 047/110] Simplified the way a Promise is tested for (removed
 promiseMarker). Removed isCancelled helper method from _Deferred, wasn't used
 nor tested. Reworked jQuery.Deferred and removed unnecessary variables. Also
 ensured a Promise will return itself when asked for a Promise. Finally, the
 jQuery.when tests have been revamped.

---
 src/core.js       | 48 +++++++++++++++++++----------------------------
 test/unit/core.js | 26 +++++++++++--------------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/src/core.js b/src/core.js
index 07666d928..95de5b978 100644
--- a/src/core.js
+++ b/src/core.js
@@ -75,10 +75,7 @@ var jQuery = function( selector, context ) {
 	indexOf = Array.prototype.indexOf,
 	
 	// [[Class]] -> type pairs
-	class2type = {},
-	
-	// Marker for deferred
-	promiseMarker = [];
+	class2type = {};
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -874,7 +871,7 @@ jQuery.extend({
 				
 				// resolve with this as context and given arguments
 				resolve: function() {
-					deferred.fire( this , arguments );
+					deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
 					return this;
 				},
 				
@@ -888,11 +885,6 @@ jQuery.extend({
 					cancelled = 1;
 					callbacks = [];
 					return this;
-				},
-				
-				// Has this deferred been cancelled?
-				isCancelled: function() {
-					return !!cancelled;
 				}
 			};
 		
@@ -903,38 +895,36 @@ jQuery.extend({
 	// Typical success/error system
 	Deferred: function( func ) {
 		
-		var errorDeferred = jQuery._Deferred(),
-			deferred = jQuery._Deferred(),
-			successCancel = deferred.cancel;
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred();
 			
 		// Add errorDeferred methods and redefine cancel			
 		jQuery.extend( deferred , {
 
-				fail: errorDeferred.then,
-				fireReject: errorDeferred.fire,
-				reject: errorDeferred.resolve,
-				isRejected: errorDeferred.isResolved,
+				fail: failDeferred.then,
+				fireReject: failDeferred.fire,
+				reject: failDeferred.resolve,
+				isRejected: failDeferred.isResolved,
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
 				promise: function( obj ) {
 					obj = obj || {};
-					for ( var i in { then:1 , fail:1 , isResolved:1 , isRejected:1 , promise:1 } ) {
-						obj[ i ] = deferred[ i ];
-					}
+					jQuery.each( "then fail isResolved isRejected".split( " " ) , function( _ , method ) {
+						obj[ method ] = deferred[ method ];
+					});
+					obj.promise = function() {
+						return obj;
+					};
 					return obj;
 				}
 
 		} );
 		
-		// Remove cancel related
-		delete deferred.cancel;
-		delete deferred.isCancelled;
-		
-		// Add promise marker
-		deferred.promise._ = promiseMarker;
-		
 		// Make sure only one callback list will be used
-		deferred.then( errorDeferred.cancel ).fail( successCancel );
+		deferred.then( failDeferred.cancel ).fail( deferred.cancel );
+		
+		// Unexpose cancel
+		delete deferred.cancel;
 		
 		// Call given func if any
 		if ( func ) {
@@ -946,7 +936,7 @@ jQuery.extend({
 
 	// Deferred helper
 	when: function( object ) {
-		object = object && object.promise && object.promise._ === promiseMarker ?
+		object = object && jQuery.isFunction( object.promise ) ?
 			object :
 			jQuery.Deferred().resolve( object );
 		return object.promise();
diff --git a/test/unit/core.js b/test/unit/core.js
index 1cd41a675..9367ab10d 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1024,30 +1024,26 @@ test("jQuery.Deferred()", function() {
 	
 test("jQuery.when()", function() {
 	
-	expect( 14 );
-	
-	var fakeDeferred = { then: function() { return this; } };
-		
-	fakeDeferred.then._ = [];
+	expect( 21 );
 	
 	// Some other objects
 	jQuery.each( {
 		
-		"Object with then & no marker": { then: jQuery.noop },
-		"Object with then & marker": fakeDeferred,
-		"string 1/2": "",
-		"string 2/2": "some string",
-		"number 1/2": 0,
-		"number 2/2": 1,
-		"boolean 1/2": true,
-		"boolean 2/2": false,
+		"an empty string": "",
+		"a non-empty string": "some string",
+		"zero": 0,
+		"a number other than zero": 1,
+		"true": true,
+		"false": false,
 		"null": null,
 		"undefined": undefined,
-		"custom method name not found automagically": {custom: jQuery._Deferred().then}
+		"a plain object": {}
 	
 	} , function( message , value ) {
 		
-		notStrictEqual( jQuery.when( value ) , value , message );
+		ok( jQuery.isFunction( jQuery.when( value ).then( function( resolveValue ) {
+			strictEqual( resolveValue , value , "Test the promise was resolved with " + message );
+		} ).promise ) , "Test " + message + " triggers the creation of a new Promise" );
 		
 	} );
 	

From 5bacb53866dbc3fbb36202a25c756a4ea2fd5965 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Mon, 20 Dec 2010 19:09:15 +0100
Subject: [PATCH 048/110] Added deferred to core. Used internally for DOM
 readyness and ajax callbacks.

---
 src/core.js       | 212 ++++++++++++++++++++++++++++++++-------
 src/xhr.js        | 183 ++++++---------------------------
 test/unit/core.js | 250 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 458 insertions(+), 187 deletions(-)

diff --git a/src/core.js b/src/core.js
index e463ade01..d41b9a9b6 100644
--- a/src/core.js
+++ b/src/core.js
@@ -59,9 +59,9 @@ var jQuery = function( selector, context ) {
 
 	// Has the ready events already been bound?
 	readyBound = false,
-
-	// The functions to execute on DOM ready
-	readyList = [],
+	
+	// The deferred used on DOM ready
+	readyList,
 
 	// The ready event handler
 	DOMContentLoaded,
@@ -75,7 +75,10 @@ var jQuery = function( selector, context ) {
 	indexOf = Array.prototype.indexOf,
 
 	// [[Class]] -> type pairs
-	class2type = {};
+	class2type = {},
+	
+	// Marker for deferred
+	deferredMarker = [];
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -252,23 +255,13 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-
-	ready: function( fn ) {
+	
+	ready: function() {
 		// Attach the listeners
 		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
+		
+		// Change ready & apply
+		return ( jQuery.fn.ready = readyList.then ).apply( this , arguments );
 	},
 
 	eq: function( i ) {
@@ -415,23 +408,11 @@ jQuery.extend({
 			}
 
 			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn,
-					i = 0,
-					ready = readyList;
-
-				// Reset the list of functions
-				readyList = null;
-
-				while ( (fn = ready[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Trigger any bound ready events
-				if ( jQuery.fn.trigger ) {
-					jQuery( document ).trigger( "ready" ).unbind( "ready" );
-				}
+			readyList.fire( document , [ jQuery ] );
+			
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
 			}
 		}
 	},
@@ -800,6 +781,160 @@ jQuery.extend({
 	now: function() {
 		return (new Date()).getTime();
 	},
+	
+	// Create a simple deferred (one callbacks list)
+	_deferred: function( cancellable ) {
+		
+		// cancellable by default
+		cancellable = cancellable !== false;
+		
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+				
+				// then( f1, f2, ...)
+				then: function() {
+					
+					if ( ! cancelled ) {
+					
+						var args = arguments,
+							i,
+							type,
+							_fired;
+							
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						
+						for ( i in args ) {
+							i = args[ i ];
+							type = jQuery.type( i );
+							if ( type === "array" ) {
+								this.then.apply( this , i );
+							} else if ( type === "function" ) {
+								callbacks.push( i );
+							}
+						}
+						
+						if ( _fired ) {
+							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+				
+				// resolve with given context and args
+				// (i is used internally)
+				fire: function( context , args , i ) {
+					if ( ! cancelled && ! fired && ! firing ) {
+						firing = 1;
+						try {
+							for( i = 0 ; ! cancelled && callbacks[ i ] ; i++ ) {
+								cancelled = ( callbacks[ i ].apply( context , args ) === false ) && cancellable;
+							}
+						} catch( e ) {
+							cancelled = cancellable;
+							jQuery.error( e );
+						} finally {
+							fired = [ context , args ];
+							callbacks = cancelled ? [] : callbacks.slice( i + 1 );
+							firing = 0;
+						}
+					}
+					return this;
+				},
+				
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.fire( this , arguments );
+					return this;
+				},
+				
+				// cancelling further callbacks
+				cancel: function() {
+					if ( cancellable ) {
+						callbacks = [];
+						cancelled = 1;
+					}
+					return this;
+				}
+				
+			};
+		
+		// Add the deferred marker
+		deferred.then._ = deferredMarker;
+		
+		return deferred;
+	},
+	
+	// Full fledged deferred (two callbacks list)
+	// Typical success/error system
+	deferred: function( func , cancellable ) {
+		
+		// Handle varargs
+		if ( arguments.length === 1 ) {
+			
+			if ( typeof func === "boolean" ) {
+				cancellable = func;
+				func = 0;
+			}
+		}
+		
+		var errorDeferred = jQuery._deferred( cancellable ),
+			deferred = jQuery._deferred( cancellable ),
+			// Keep reference of the cancel method since we'll redefine it
+			cancelThen = deferred.cancel;
+			
+		// Add errorDeferred methods and redefine cancel			
+		jQuery.extend( deferred , {
+
+				fail: errorDeferred.then,
+				fireReject: errorDeferred.fire,
+				reject: errorDeferred.resolve,
+				cancel: function() {
+					cancelThen();
+					errorDeferred.cancel();
+					return this;
+				}
+
+		} );
+		
+		// Make sure only one callback list will be used
+		deferred.then( errorDeferred.cancel ).fail( cancelThen );
+		
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred , deferred );
+		}
+		
+		return deferred;
+	},
+
+	// Check if an object is a deferred
+	isDeferred: function( object , method ) {
+		method = method || "then";
+		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	},
+	
+	// Deferred helper
+	when: function( object , method ) {
+		method = method || "then";
+		object = jQuery.isDeferred( object , method ) ?
+			object :
+			jQuery.deferred().resolve( object );
+		object.fail = object.fail || function() { return this; };
+		object[ method ] = object[ method ] || object.then;
+		object.then = object.then || object[ method ];
+		return object;
+	},
 
 	// Use of jQuery.browser is frowned upon.
 	// More details: http://docs.jquery.com/Utilities/jQuery.browser
@@ -818,6 +953,11 @@ jQuery.extend({
 	browser: {}
 });
 
+// Create readyList deferred
+// also force $.fn.ready to be recognized as a defer
+readyList = jQuery._deferred( false );
+jQuery.fn.ready._ = deferredMarker;
+
 // Populate the class2type map
 jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
diff --git a/src/xhr.js b/src/xhr.js
index c71539632..51bd3dfd0 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -17,20 +17,21 @@ jQuery.xhr = function( _native ) {
 	if ( _native ) {
 		return jQuery.ajaxSettings.xhr();
 	}
-
-	function reset(force) {
-
+	
+	function reset( force ) {
+		
 		// We only need to reset if we went through the init phase
 		// (with the exception of object creation)
 		if ( force || internal ) {
-
+			
 			// Reset callbacks lists
-			callbacksLists = {
-				success: createCBList(),
-				error: createCBList(),
-				complete: createCBList()
-			};
-
+			deferred = jQuery.deferred();
+			completeDeferred = jQuery._deferred();
+			
+			xhr.success = xhr.then = deferred.then;
+			xhr.error = xhr.fail = deferred.fail;
+			xhr.complete = completeDeferred.then;
+			
 			// Reset private variables
 			requestHeaders = {};
 			responseHeadersString = responseHeaders = internal = done = timeoutTimer = s = undefined;
@@ -154,9 +155,9 @@ jQuery.xhr = function( _native ) {
 
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
-
-		for ( i in callbacksLists ) {
-			callbacksLists[i].bind(s[i]);
+		
+		for ( i in { success:1, error:1, complete:1 } ) {
+			xhr[ i ]( s[ i ] );
 		}
 
 		// Watch for a new set of requests
@@ -355,10 +356,12 @@ jQuery.xhr = function( _native ) {
 
 		// Keep local copies of vars in case callbacks re-use the xhr
 		var _s = s,
-			_callbacksLists = callbacksLists,
+			_deferred = deferred,
+			_completeDeferred = completeDeferred,
 			_callbackContext = callbackContext,
 			_globalEventContext = globalEventContext;
-
+			
+			
 		// Set state if the xhr hasn't been re-used
 		function _setState( value ) {
 			if ( xhr.readyState && s === _s ) {
@@ -374,19 +377,21 @@ jQuery.xhr = function( _native ) {
 
 		// We're done
 		_setState( 4 );
-
-		// Success
-		_callbacksLists.success.fire( isSuccess , _callbackContext , success, statusText, xhr);
-		if ( isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxSuccess", [xhr, _s, success] );
+		
+		// Success/Error
+		if ( isSuccess ) {
+			_deferred.fire( _callbackContext , [ success , statusText , xhr ] );
+		} else {
+			_deferred.fireReject( _callbackContext , [ xhr , statusText , error ] );
 		}
-		// Error
-		_callbacksLists.error.fire( ! isSuccess , _callbackContext , xhr, statusText, error);
-		if ( !isSuccess && _s.global ) {
-			_globalEventContext.trigger( "ajaxError", [xhr, _s, error] );
+		
+		if ( _s.global ) {
+			_globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , [ xhr , _s , isSuccess ? success : error ] );
 		}
+		
 		// Complete
-		_callbacksLists.complete.fire( 1 , _callbackContext, xhr, statusText);
+		_completeDeferred.fire( _callbackContext, [ xhr , statusText ] );
+		
 		if ( _s.global ) {
 			_globalEventContext.trigger( "ajaxComplete", [xhr, _s] );
 			// Handle the global AJAX counter
@@ -419,7 +424,8 @@ jQuery.xhr = function( _native ) {
 		// Callback stuff
 		callbackContext,
 		globalEventContext,
-		callbacksLists,
+		deferred,
+		completeDeferred,
 		// Headers (they are sent all at once)
 		requestHeaders,
 		// Response headers
@@ -596,135 +602,10 @@ jQuery.xhr = function( _native ) {
 	// Init data (so that we can bind callbacks early
 	reset(1);
 
-	// Install callbacks related methods
-	jQuery.each(callbacksLists, function(name) {
-		var list;
-		xhr[name] = function() {
-			list = callbacksLists[name];
-			if ( list ) {
-				list.bind.apply(list, arguments );
-			}
-			return this;
-		};
-	});
-
 	// Return the xhr emulation
 	return xhr;
 };
 
-// Create a callback list
-function createCBList() {
-
-	var functors = [],
-		autoFire = 0,
-		fireArgs,
-		list = {
-
-			fire: function( flag , context ) {
-
-				// Save info for later bindings
-				fireArgs = arguments;
-
-				// Remove autoFire to keep bindings in order
-				autoFire = 0;
-
-				var args = sliceFunc.call( fireArgs , 2 );
-
-				// Execute callbacks
-				while ( flag && functors.length ) {
-					flag = functors.shift().apply( context , args ) !== false;
-				}
-
-				// Clean if asked to stop
-				if ( ! flag ) {
-					clean();
-				}
-
-				// Set autoFire
-				autoFire = 1;
-			},
-
-			bind: function() {
-
-				var args = arguments,
-					i = 0,
-					length = args.length,
-					func;
-
-				for ( ; i < length ; i++ ) {
-
-					func = args[ i ];
-
-					if ( jQuery.isArray(func) ) {
-
-						list.bind.apply( list , func );
-
-					} else if ( isFunction(func) ) {
-
-						// Add if not already in
-						if ( ! pos( func ) ) {
-							functors.push( func );
-						}
-					}
-				}
-
-				if ( autoFire ) {
-					list.fire.apply( list , fireArgs );
-				}
-			},
-
-			unbind: function() {
-
-				var i = 0,
-					args = arguments,
-					length = args.length,
-					func,
-					position;
-
-				if ( length ) {
-
-					for( ; i < length ; i++ ) {
-						func = args[i];
-						if ( jQuery.isArray(func) ) {
-							list.unbind.apply(list,func);
-						} else if ( isFunction(func) ) {
-							position = pos(func);
-							if ( position ) {
-								functors.splice(position-1,1);
-							}
-						}
-					}
-
-				} else {
-
-					functors = [];
-
-				}
-
-			}
-
-		};
-
-	// Get the index of the functor in the list (1-based)
-	function pos( func ) {
-		for (var i = 0, length = functors.length; i < length && functors[i] !== func; i++) {
-		}
-		return i < length ? ( i + 1 ) : 0;
-	}
-
-	// Clean the object
-	function clean() {
-		// Empty callbacks list
-		functors = [];
-		// Inhibit methods
-		for (var i in list) {
-			list[i] = jQuery.noop;
-		}
-	}
-
-	return list;
-}
-
 jQuery.extend(jQuery.xhr, {
 
 	// Add new prefilter
diff --git a/test/unit/core.js b/test/unit/core.js
index 5c80569ca..e847de1de 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -904,3 +904,253 @@ test("jQuery.parseJSON", function(){
 		ok( true, "Test malformed JSON string." );
 	}
 });
+
+test("jQuery._deferred()", function() {
+	
+	expect( 14 );
+	
+	var deferred,
+		object,
+		test;
+	
+	deferred = jQuery._deferred();
+		
+	test = false;
+		
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test pre-resolve callback" );
+		test = true;
+	} );
+	
+	deferred.resolve( "value" );
+	
+	ok( test , "Test pre-resolve callbacks called right away" );
+
+	test = false;
+	
+	deferred.then( function( value ) {
+		equals( value , "value" , "Test post-resolve callback" );
+		test = true;
+	} );
+	
+	ok( test , "Test post-resolve callbacks called right away" );
+	
+	deferred.cancel();
+	
+	test = true;
+	
+	deferred.then( function() {
+		ok( false , "Manual cancel was ignored" );
+		test = false;
+	} );
+	
+	ok( test , "Test manual cancel" );
+	
+	deferred = jQuery._deferred().then( function() {
+		return false;
+	} );
+	
+	deferred.resolve();
+	
+	test = true;
+	
+	deferred.then( function() {
+		test = false;
+	} );
+	
+	ok( test , "Test cancel by returning false" );
+
+	try {
+		deferred = jQuery._deferred().resolve().then( function() {
+			throw "Error";
+		} , function() {
+			ok( false , "Test deferred cancel on exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	test = "";
+	deferred = jQuery._deferred().then( function() {
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+		
+	} ).resolve();
+	
+	strictEqual( test , "AB" , "Test multiple then parameters" );
+	
+	test = "";
+	
+	deferred.then( function() {
+		
+		deferred.then( function() {
+			
+			test += "C";
+			
+		} );
+		
+		test += "A";
+		
+	}, function() {
+		
+		test += "B";
+	} );
+	
+	strictEqual( test , "ABC" , "Test then callbacks order" );
+	
+	deferred = jQuery._deferred( false ).resolve().cancel();
+	
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled manually");
+		return false;
+	} );
+
+	deferred.then( function() {
+		ok( true , "Test non-cancellable deferred not cancelled by returning false");
+	} );
+	
+	try {
+		deferred.then( function() {
+			throw "Error";
+		} , function() {
+			ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
+		} );
+	} catch( e ) {
+		strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
+		deferred.then();
+	}
+	
+	deferred = jQuery._deferred();
+	
+	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
+		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
+	});
+});
+
+test("jQuery.deferred()", function() {
+	
+	expect( 8 );
+	
+	jQuery.deferred( function( defer ) {
+		strictEqual( this , defer , "Defer passed as this & first argument" );
+		this.resolve( "done" );
+	}).then( function( value ) {
+		strictEqual( value , "done" , "Passed function executed" );
+	});
+	
+	jQuery.deferred().resolve().then( function() {
+		ok( true , "Success on resolve" );
+	}).fail( function() {
+		ok( false , "Error on resolve" );
+	});
+	
+	jQuery.deferred().reject().then( function() {
+		ok( false , "Success on reject" );
+	}).fail( function() {
+		ok( true , "Error on reject" );
+	});
+	
+	var flag = true;
+	
+	jQuery.deferred().resolve().cancel().then( function() {
+		ok( flag = false , "Success on resolve/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on resolve/cancel" );
+	});
+	
+	ok( flag , "Cancel on resolve" );
+	
+	flag = true;
+	
+	jQuery.deferred().reject().cancel().then( function() {
+		ok( flag = false , "Success on reject/cancel" );
+	}).fail( function() {
+		ok( flag = false , "Error on reject/cancel" );
+	});
+	
+	ok( flag , "Cancel on reject" );
+	
+	jQuery.deferred( false ).resolve().then( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on resolve" );
+	});
+	
+	jQuery.deferred( false ).reject().fail( function() {
+		return false;
+	} , function() {
+		ok( true , "Not cancelled on reject" );
+	});
+	
+});
+	
+test("jQuery.isDeferred()", function() {
+	
+	expect( 11 );
+	
+	var object1 = { then: function() { return this; } },
+		object2 = { then: function() { return this; } };
+		
+	object2.then._ = [];
+	
+	// The use case that we want to match
+	ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
+	ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
+	
+	// Some other objects
+	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
+	ok(!jQuery.isDeferred(object2), "Object with then & marker");
+	
+	// Not objects shouldn't be matched
+	ok(!jQuery.isDeferred(""), "string");
+	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
+	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
+	ok(!jQuery.isDeferred(null), "null");
+	ok(!jQuery.isDeferred(undefined), "undefined");
+	
+	object1 = {custom: jQuery._deferred().then};
+	
+	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
+	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
+});
+
+test("jQuery.when()", function() {
+	
+	expect( 5 );
+	
+	var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
+	
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || jQuery.deferred( function() {
+			this.resolve( i );
+		}) ).then( function( value ) {
+			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Fail called" );
+		});
+	}
+	
+	cache = 0;
+
+	for( i = 1 ; i < 3 ; i++ ) {
+		jQuery.when( cache || deferred , "done" ).done( function( value ) {
+			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
+			cache = value;
+		}).fail( function() {
+			ok( false , "Custom method: fail called" );
+		});
+	}
+	
+	stop();
+	
+	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
+		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
+		start();
+	});
+});

From c072dbd4e283f2e601b0004920c46d2e6b62f899 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 00:56:00 +0100
Subject: [PATCH 049/110] Fixed a loop that only worked in webkit.

---
 src/core.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/core.js b/src/core.js
index d41b9a9b6..d141c4d69 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,12 +800,14 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function() {
+				then: function then() {
 					
 					if ( ! cancelled ) {
 					
 						var args = arguments,
 							i,
+							length,
+							elem,
 							type,
 							_fired;
 							
@@ -814,13 +816,13 @@ jQuery.extend({
 							fired = 0;
 						}
 						
-						for ( i in args ) {
-							i = args[ i ];
-							type = jQuery.type( i );
+						for ( i = 0, length = args.length ; i < length ; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								this.then.apply( this , i );
+								then.apply( this , elem );
 							} else if ( type === "function" ) {
-								callbacks.push( i );
+								callbacks.push( elem );
 							}
 						}
 						

From 4c49c87d4daf7a5eb1b98a4d324ee599508cf1be Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 13:06:41 +0100
Subject: [PATCH 050/110] Renamed jQuery.xhr.bindTransport as
 jQuery.xhr.transport. Generalized the implementation and made prefilters use
 the same logic. Cleaned up code and removed as many loops and each as
 possible.

---
 src/ajax.js              |  13 +--
 src/transports/jsonp.js  |  14 ++-
 src/transports/script.js |   2 +-
 src/transports/xhr.js    |   2 +-
 src/xhr.js               | 201 ++++++++++++++++++---------------------
 5 files changed, 109 insertions(+), 123 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 08fbe6f01..a5fff4e81 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -191,16 +191,17 @@ jQuery.extend({
 		// 2) These are called:
 		//    * BEFORE asking for a transport
 		//    * AFTER param serialization (s.data is a string if s.processData is true)
-		// 3) They MUST be order agnostic
-		prefilters: [],
-
+		// 3) key is the dataType
+		// 4) the catchall symbol "*" can be used
+		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
+		prefilters: {},
+		
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
-		transports: {
-		},
-
+		transports: {},
+		
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index d9e77f2f3..6c9fb704e 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -11,12 +11,14 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
-// 2) ensure transportDataType is json
+// 2) sneakily ensure transportDataType is json
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
-jQuery.xhr.prefilter( function(s) {
+jQuery.xhr.prefilter("json jsonp", function(s) {
 	
-	var transportDataType = s.dataTypes[0];
+	var transportDataType = s.dataTypes[ 0 ];
+	
+	s.dataTypes[ 0 ] = "json";
 	
 	if ( s.jsonp ||
 		transportDataType === "jsonp" ||
@@ -34,14 +36,10 @@ jQuery.xhr.prefilter( function(s) {
 		
 		s.url = url;
 		s.data = data;
-		
-		s.dataTypes[0] = "json";
 	}
 	
-});
-
 // Bind transport to json dataType
-jQuery.xhr.bindTransport("json", function(s) {
+}).transport("json", function(s) {
 
 	if ( s.jsonp ) {
 		
diff --git a/src/transports/script.js b/src/transports/script.js
index 7416a2d1a..27473ee7e 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -17,7 +17,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.bindTransport("script", function(s) {
+jQuery.xhr.transport("script", function(s) {
 	
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 783ee4604..978f6c259 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrUnloadAbortMarker = [];
 
 	
-jQuery.xhr.bindTransport( function( s , determineDataType ) {
+jQuery.xhr.transport( function( s , determineDataType ) {
 	
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
diff --git a/src/xhr.js b/src/xhr.js
index 51bd3dfd0..d64238a60 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -86,15 +86,10 @@ jQuery.xhr = function( _native ) {
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
-
-		// Apply option prefilters
-		for ( i = 0; i < prefilters.length; i++ ) {
-			prefilters[i](s);
-		}
-
+		
 		// Get internal
-		internal = selectTransport( s );
-
+		internal = jQuery.xhr.prefilter( s ).transport( s );
+		
 		// Re-actualize url & data
 		url = s.url;
 		data = s.data;
@@ -606,101 +601,19 @@ jQuery.xhr = function( _native ) {
 	return xhr;
 };
 
-jQuery.extend(jQuery.xhr, {
-
-	// Add new prefilter
-	prefilter: function (functor) {
-		if ( isFunction(functor) ) {
-			jQuery.ajaxSettings.prefilters.push( functor );
-		}
-		return this;
-	},
-
-	// Bind a transport to one or more dataTypes
-	bindTransport: function () {
-
-		var args = arguments,
-			i,
-			start = 0,
-			length = args.length,
-			dataTypes = [ "*" ],
-			functors = [],
-			functor,
-			first,
-			append,
-			list,
-			transports = jQuery.ajaxSettings.transports;
-
-		if ( length ) {
-
-			if ( ! isFunction( args[ 0 ] ) ) {
-
-				dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-				start = 1;
-
-			}
-
-			if ( dataTypes.length && start < length ) {
-
-				for ( i = start; i < length; i++ ) {
-					functor = args[i];
-					if ( isFunction(functor) ) {
-						functors.push( functor );
-					}
-				}
-
-				if ( functors.length ) {
-
-					jQuery.each ( dataTypes, function( _ , dataType ) {
-
-						first = /^\+/.test( dataType );
-
-						if (first) {
-							dataType = dataType.substr(1);
-						}
-
-						if ( dataType !== "" ) {
-
-							append = Array.prototype[ first ? "unshift" : "push" ];
-
-							list = transports[ dataType ];
-
-							jQuery.each ( functors, function( _ , functor ) {
-
-								if ( ! list ) {
-
-									list = transports[ dataType ] = [ functor ];
-
-								} else {
-
-									append.call( list , functor );
-								}
-							} );
-						}
-
-					} );
-				}
-			}
-		}
-
-		return this;
-	}
-
-
-});
-
-// Select a transport given options
-function selectTransport( s ) {
+// Execute or select from functions in a given structure of options
+function xhr_selectOrExecute( structure , s ) {
 
 	var dataTypes = s.dataTypes,
 		transportDataType,
-		transportsList,
-		transport,
+		list,
+		selected,
 		i,
 		length,
 		checked = {},
-		flag;
-
+		flag,
+		noSelect = structure !== "transports";
+		
 	function initSearch( dataType ) {
 
 		flag = transportDataType !== dataType && ! checked[ dataType ];
@@ -709,9 +622,9 @@ function selectTransport( s ) {
 
 			checked[ dataType ] = 1;
 			transportDataType = dataType;
-			transportsList = s.transports[ dataType ];
+			list = s[ structure ][ dataType ];
 			i = -1;
-			length = transportsList ? transportsList.length : 0 ;
+			length = list ? list.length : 0 ;
 		}
 
 		return flag;
@@ -719,30 +632,104 @@ function selectTransport( s ) {
 
 	initSearch( dataTypes[ 0 ] );
 
-	for ( i = 0 ; ! transport && i <= length ; i++ ) {
-
+	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
+		
 		if ( i === length ) {
 
 			initSearch( "*" );
 
 		} else {
 
-			transport = transportsList[ i ]( s , determineDataType );
+			selected = list[ i ]( s , determineDataType );
 
 			// If we got redirected to another dataType
 			// Search there (if not in progress or already tried)
-			if ( typeof( transport ) === "string" &&
-				initSearch( transport ) ) {
+			if ( typeof( selected ) === "string" &&
+				initSearch( selected ) ) {
 
-				dataTypes.unshift( transport );
-				transport = 0;
+				dataTypes.unshift( selected );
+				selected = 0;
 			}
 		}
 	}
 
-	return transport;
+	return noSelect ? jQuery.xhr : selected;
 }
 
+// Add an element to one of the xhr structures in ajaxSettings
+function xhr_addElement( structure , args ) {
+		
+	var i,
+		j,
+		start = 0,
+		length = args.length,
+		dataTypes = [ "*" ],
+		dLength = 1,
+		dataType,
+		functors = [],
+		first,
+		append,
+		list;
+		
+	if ( length ) {
+		
+		first = jQuery.type( args[ 0 ] );
+		
+		if ( first === "object" ) {
+			return xhr_selectOrExecute( structure , args[ 0 ] );
+		}
+		
+		structure = jQuery.ajaxSettings[ structure ];
+		
+		if ( first !== "function" ) {
+			
+			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
+			dLength = dataTypes.length;
+			start = 1;
+			
+		}
+		
+		if ( dLength && start < length ) {
+			
+			functors = sliceFunc.call( args , start );
+			
+			length -= start;
+					
+			for( i = 0 ; i < dLength ; i++ ) {
+				
+				dataType = dataTypes[ i ];
+				
+				first = /^\+/.test( dataType );
+				
+				if (first) {
+					dataType = dataType.substr(1);
+				}
+				
+				if ( dataType !== "" ) {
+				
+					append = Array.prototype[ first ? "unshift" : "push" ];
+					
+					list = structure[ dataType ] = structure[ dataType ] || [];
+			
+					for ( j = 0; j < length; j++ ) {
+						append.call( list , functors[ j ] );
+					}
+				}
+			}
+		}
+	}
+	
+	return jQuery.xhr;
+}
+
+// Install prefilter & transport methods
+jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
+	_ = name + "s";
+	jQuery.xhr[ name ] = function() {
+		return xhr_addElement( _ , arguments );
+	};
+} );
+	
 // Utility function that handles dataType when response is received
 // (for those transports that can give text or xml responses)
 function determineDataType( s , ct , text , xml ) {

From fef0f63526df8c4e186780c742fbcd717424581b Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 16:58:52 +0100
Subject: [PATCH 051/110] Rewrote the data conversion logic in ajax. Should be
 cleaner and faster.

---
 src/ajax.js |   9 +--
 src/xhr.js  | 175 +++++++++++++++++++++-------------------------------
 2 files changed, 71 insertions(+), 113 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index a5fff4e81..6f09362e5 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -166,11 +166,6 @@ jQuery.extend({
 		xhr: function() {
 			return new window.XMLHttpRequest();
 		},
-		xhrResponseFields: {
-			xml: "XML",
-			text: "Text",
-			json: "JSON"
-		},
 
 		accepts: {
 			xml: "application/xml, text/xml",
@@ -195,13 +190,13 @@ jQuery.extend({
 		// 4) the catchall symbol "*" can be used
 		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
 		prefilters: {},
-		
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
-		
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
diff --git a/src/xhr.js b/src/xhr.js
index d64238a60..94c6fe165 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -6,11 +6,9 @@ var rquery_xhr = /\?/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-
-	sliceFunc = Array.prototype.slice,
-
-	isFunction = jQuery.isFunction;
-
+	
+	sliceFunc = Array.prototype.slice;
+	
 // Creates a jQuery xhr object
 jQuery.xhr = function( _native ) {
 
@@ -86,7 +84,7 @@ jQuery.xhr = function( _native ) {
 		if ( data && s.processData && typeof data != "string" ) {
 			data = s.data = jQuery.param( data , s.traditional );
 		}
-		
+
 		// Get internal
 		internal = jQuery.xhr.prefilter( s ).transport( s );
 		
@@ -147,7 +145,7 @@ jQuery.xhr = function( _native ) {
 				requestHeaders[ i.toLowerCase() ] = headers[ i ];
 			}
 		}
-
+		
 		callbackContext = s.context || s;
 		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
 		
@@ -223,112 +221,77 @@ jQuery.xhr = function( _native ) {
 				// Chain data conversions and determine the final value
 				// (if an exception is thrown in the process, it'll be notified as an error)
 				try {
-
-					function checkData(data) {
-						if ( data !== undefined ) {
-							var testFunction = s.dataCheckers[srcDataType];
-							if ( isFunction( testFunction ) ) {
-								testFunction(data);
-							}
-						}
-					}
-
-					function convertData (data) {
-						var conversionFunction = dataConverters[srcDataType+" => "+destDataType] ||
-								dataConverters["* => "+destDataType],
-							noFunction = ! isFunction( conversionFunction );
-						if ( noFunction ) {
-							if ( srcDataType != "text" && destDataType != "text" ) {
-								// We try to put text inbetween
-								var first = dataConverters[srcDataType+" => text"] ||
-										dataConverters["* => text"],
-									second = dataConverters["text => "+destDataType] ||
-										dataConverters["* => "+destDataType],
-									areFunctions = isFunction( first ) && isFunction( second );
-								if ( areFunctions ) {
-									conversionFunction = function (data) {
-										return second( first ( data ) );
-									};
-								}
-								noFunction = ! areFunctions;
-							}
-							if ( noFunction ) {
-								jQuery.error( "no data converter between " + srcDataType + " and " + destDataType );
-							}
-
-						}
-						return conversionFunction(data);
-					}
-
-					var dataTypes = s.dataTypes,
-						i,
-						length,
-						data = response,
+					
+					var i,
+						current,
+						prev,
+						checker,
+						conv1,
+						conv2,
+						oneConv,
+						convertion,
+						dataTypes = s.dataTypes,
+						dataCheckers = s.dataCheckers,
 						dataConverters = s.dataConverters,
-						srcDataType,
-						destDataType,
-						responseTypes = s.xhrResponseFields;
-
-					for ( i = 0, length = dataTypes.length ; i < length ; i++ ) {
-
-						destDataType = dataTypes[i];
-
-						if ( !srcDataType ) { // First time
-
-							// Copy type
-							srcDataType = destDataType;
-							// Check
-							checkData(data);
-							// Apply dataFilter
-							if ( isFunction( s.dataFilter ) ) {
-								data = s.dataFilter(data, s.dataType);
-								// Recheck data
-								checkData(data);
+						dataFilter = s.dataFilter,
+						responses = {
+							"xml": "XML",
+							"text": "Text"
+						};
+					
+					for( i = 0 ; i < dataTypes.length ; i++ ) {
+						
+						current = dataTypes[ i ];
+						
+						if ( i ) {
+							
+							prev = dataTypes[ i - 1 ];
+							
+							if ( prev === "*" ) {
+								
+								prev = current;
+								
+							} else if ( current !== "*" && prev !== current ) {
+							
+								oneConv = conv1 = 
+									dataConverters[ ( conversion = prev + " => " + current ) ] ||
+									dataConverters[ "* => " + current ];
+								
+								if ( ! oneConv && prev !== "text" && current !== "text" ) {
+									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
+									conv2 = dataConverters[ "text => " + current ];
+								}
+								if ( oneConv || conv1 && conv2 ) {
+									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+								} else {
+									throw "no " + conversion;
+								}
 							}
-
-						} else { // Subsequent times
-
-							// handle auto
-							// JULIAN: for reasons unknown to me === doesn't work here
-							if (destDataType == "*") {
-
-								destDataType = srcDataType;
-
-							} else if ( srcDataType != destDataType ) {
-
-								// Convert
-								data = convertData(data);
-								// Copy type & check
-								srcDataType = destDataType;
-								checkData(data);
-
-							}
-
 						}
-
-						// Copy response into the xhr if it hasn't been already
-						var responseDataType,
-							responseType = responseTypes[srcDataType];
-
-						if ( responseType ) {
-
-							responseDataType = srcDataType;
-
-						} else {
-
-							responseType = responseTypes[ responseDataType = "text" ];
-
+						
+						checker = dataCheckers[ current ];
+						
+						if ( response != null && checker ) {
+							checker( response );
 						}
-
-						if ( responseType !== 1 ) {
-							xhr[ "response" + responseType ] = data;
-							responseTypes[ responseType ] = 1;
+						
+						if ( responses[ current ] ) {
+							xhr[ "response" + responses[ current ] ] = response;
+							responses[ current ] = 0;
+						}
+						
+						if ( ! i && dataFilter ) {
+							
+							response = dataFilter( response );
+							
+							dataTypes = s.dataTypes;
+							dataFilter = 0;
+							i--;
 						}
-
 					}
 
 					// We have a real success
-					success = data;
+					success = response;
 					isSuccess = 1;
 
 				} catch(e) {
@@ -406,7 +369,7 @@ jQuery.xhr = function( _native ) {
 	// Ready state change
 	function setState( value ) {
 		xhr.readyState = value;
-		if ( isFunction( xhr.onreadystatechange ) ) {
+		if ( jQuery.isFunction( xhr.onreadystatechange ) ) {
 			xhr.onreadystatechange();
 		}
 	}

From 43828b7482d33e4ee96f482779b98528b7266ea2 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 17:04:07 +0100
Subject: [PATCH 052/110] Removed NFE to make old Safari happy and avoid leaks
 in IE (as per David Murdoch's warning).

---
 src/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index d141c4d69..34d8094a0 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function then() {
+				then: function () {
 					
 					if ( ! cancelled ) {
 					
@@ -820,7 +820,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								then.apply( this , elem );
+								deferred.then.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}

From 39d96ab8c55a044deccaff0ef8bc2c5813656368 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Mon, 20 Dec 2010 19:09:15 +0100
Subject: [PATCH 053/110] Added deferred to core. Used internally for DOM
 readyness and ajax callbacks.

---
 src/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core.js b/src/core.js
index 34d8094a0..79ea5cebc 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function () {
+				then: function() {
 					
 					if ( ! cancelled ) {
 					

From 2fec5dbecd3dc6d2acfcb4df28d29638637ac579 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 00:56:00 +0100
Subject: [PATCH 054/110] Fixed a loop that only worked in webkit.

---
 src/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index 79ea5cebc..d141c4d69 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function() {
+				then: function then() {
 					
 					if ( ! cancelled ) {
 					
@@ -820,7 +820,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								deferred.then.apply( deferred , elem );
+								then.apply( this , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}

From e29ebbc199ecf1d2c9f5b7de9113f34e818ffe11 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 13:06:41 +0100
Subject: [PATCH 055/110] Renamed jQuery.xhr.bindTransport as
 jQuery.xhr.transport. Generalized the implementation and made prefilters use
 the same logic. Cleaned up code and removed as many loops and each as
 possible.

---
 src/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 6f09362e5..d631def50 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -190,13 +190,13 @@ jQuery.extend({
 		// 4) the catchall symbol "*" can be used
 		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
 		prefilters: {},
-
+		
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
-
+		
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response

From d5bb001b9a3cbe0753d11f7c20cede83e9c2d775 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 16:58:52 +0100
Subject: [PATCH 056/110] Rewrote the data conversion logic in ajax. Should be
 cleaner and faster.

---
 src/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index d631def50..6f09362e5 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -190,13 +190,13 @@ jQuery.extend({
 		// 4) the catchall symbol "*" can be used
 		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
 		prefilters: {},
-		
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
-		
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response

From 5bfbe7eaf6481cfda6f2c790fa070d58e1abc74d Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Tue, 21 Dec 2010 17:04:07 +0100
Subject: [PATCH 057/110] Removed NFE to make old Safari happy and avoid leaks
 in IE (as per David Murdoch's warning).

---
 src/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index d141c4d69..34d8094a0 100644
--- a/src/core.js
+++ b/src/core.js
@@ -800,7 +800,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function then() {
+				then: function () {
 					
 					if ( ! cancelled ) {
 					
@@ -820,7 +820,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								then.apply( this , elem );
+								deferred.then.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}

From 524bf39400e12db84e6857988d431c2c8ca7b2fb Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:02:00 +0100
Subject: [PATCH 058/110] jQuery.parseXML extracted from ajax & added to core,
 needs unit testing.

---
 src/core.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/core.js b/src/core.js
index 34d8094a0..0f9801a79 100644
--- a/src/core.js
+++ b/src/core.js
@@ -546,6 +546,28 @@ jQuery.extend({
 			jQuery.error( "Invalid JSON: " + data );
 		}
 	},
+	
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+		
+		tmp = xml.documentElement;
+		
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		
+		return xml;
+	},
 
 	noop: function() {},
 

From 22e28b01e60e87b2454f88ca128fb84916b13564 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:02:45 +0100
Subject: [PATCH 059/110] Changed dataConverters key format.

---
 src/ajax.js              | 25 +++++--------------------
 src/transports/jsonp.js  |  6 ++----
 src/transports/script.js |  2 +-
 src/xhr.js               | 10 ++++++----
 test/unit/ajax.js        |  6 +++++-
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 6f09362e5..4f1fc6c42 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -223,36 +223,21 @@ jQuery.extend({
 		},
 
 		// List of data converters
-		// 1) key format is "source_type => destination_type" (spaces required)
+		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
 
 			// Convert anything to text
-			"* => text": function(data) {
-				return "" + data;
-			},
+			"* text": window.String,
 
 			// Text to html (no transformation)
-			"text => html": function(data) {
-				return data;
-			},
+			"text html": window.String,
 
 			// Evaluate text as a json expression
-			"text => json": jQuery.parseJSON,
+			"text json": jQuery.parseJSON,
 
 			// Parse text as xml
-			"text => xml": function(data) {
-				var xml, parser;
-				if ( window.DOMParser ) { // Standard
-					parser = new DOMParser();
-					xml = parser.parseFromString(data,"text/xml");
-				} else { // IE
-					xml = new ActiveXObject("Microsoft.XMLDOM");
-					xml.async="false";
-					xml.loadXML(data);
-				}
-				return xml;
-			}
+			"text xml": jQuery.parseXML
 		}
 	},
 
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index 6c9fb704e..a685bb196 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -70,18 +70,16 @@ jQuery.xhr.prefilter("json jsonp", function(s) {
 		}, s.complete ];
 				
 		// Use data converter to retrieve json after script execution
-		s.dataConverters["script => json"] = function() {
+		s.dataConverters["script json"] = function() {
 			if ( ! responseContainer ) {
-				jQuery.error("Callback '" + jsonpCallback + "' was not called");
+				jQuery.error( jsonpCallback + " was not called" );
 			}
 			return responseContainer[ 0 ];
 		};
 		
 		// Delegate to script transport
 		return "script";
-		
 	}
-
 });
 
 })( jQuery );
diff --git a/src/transports/script.js b/src/transports/script.js
index 27473ee7e..4f55dc5ad 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -12,7 +12,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 	},
 		
 	dataConverters: {
-		"text => script": jQuery.globalEval
+		"text script": jQuery.globalEval
 	}
 } );
 
diff --git a/src/xhr.js b/src/xhr.js
index 94c6fe165..929c99f9a 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -254,12 +254,14 @@ jQuery.xhr = function( _native ) {
 							} else if ( current !== "*" && prev !== current ) {
 							
 								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " => " + current ) ] ||
-									dataConverters[ "* => " + current ];
+									dataConverters[ ( conversion = prev + " " + current ) ] ||
+									dataConverters[ "* " + current ];
+								
+								console.log( conversion );
 								
 								if ( ! oneConv && prev !== "text" && current !== "text" ) {
-									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
-									conv2 = dataConverters[ "text => " + current ];
+									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+									conv2 = dataConverters[ "text " + current ];
 								}
 								if ( oneConv || conv1 && conv2 ) {
 									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index beec2c537..88d66bf47 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -707,6 +707,10 @@ test("jQuery.ajax - xml: non-namespace elements inside namespaced elements (over
 		equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
 		equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
 		start();
+	  },
+	  error: function(_1,_2,error) {
+		ok( false, error );
+		start();
 	  }
 	});
 });
@@ -1487,7 +1491,7 @@ test("jQuery.ajax() - json by content-type disabled with options", function() {
 		},
 		success: function( text ) {
 			equals( typeof text , "string" , "json wasn't auto-determined" );
-			var json = this.dataConverters["text => json"]( text );
+			var json = this.dataConverters["text json"]( text );
 	  		ok( json.length >= 2, "Check length");
 	  		equals( json[0].name, 'John', 'Check JSON: first, name' );
 	  		equals( json[0].age, 21, 'Check JSON: first, age' );

From 2d4001b82c6325ac6a767294e96a8af8f920f7cd Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:53:55 +0100
Subject: [PATCH 060/110] Capitalized Deferred & _Deferred to clearly mark them
 as new types, like Event.

---
 src/core.js       | 12 ++++++------
 src/xhr.js        |  4 ++--
 test/unit/core.js | 40 ++++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/core.js b/src/core.js
index 0f9801a79..1beebd17b 100644
--- a/src/core.js
+++ b/src/core.js
@@ -805,7 +805,7 @@ jQuery.extend({
 	},
 	
 	// Create a simple deferred (one callbacks list)
-	_deferred: function( cancellable ) {
+	_Deferred: function( cancellable ) {
 		
 		// cancellable by default
 		cancellable = cancellable !== false;
@@ -901,7 +901,7 @@ jQuery.extend({
 	
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
-	deferred: function( func , cancellable ) {
+	Deferred: function( func , cancellable ) {
 		
 		// Handle varargs
 		if ( arguments.length === 1 ) {
@@ -912,8 +912,8 @@ jQuery.extend({
 			}
 		}
 		
-		var errorDeferred = jQuery._deferred( cancellable ),
-			deferred = jQuery._deferred( cancellable ),
+		var errorDeferred = jQuery._Deferred( cancellable ),
+			deferred = jQuery._Deferred( cancellable ),
 			// Keep reference of the cancel method since we'll redefine it
 			cancelThen = deferred.cancel;
 			
@@ -953,7 +953,7 @@ jQuery.extend({
 		method = method || "then";
 		object = jQuery.isDeferred( object , method ) ?
 			object :
-			jQuery.deferred().resolve( object );
+			jQuery.Deferred().resolve( object );
 		object.fail = object.fail || function() { return this; };
 		object[ method ] = object[ method ] || object.then;
 		object.then = object.then || object[ method ];
@@ -979,7 +979,7 @@ jQuery.extend({
 
 // Create readyList deferred
 // also force $.fn.ready to be recognized as a defer
-readyList = jQuery._deferred( false );
+readyList = jQuery._Deferred( false );
 jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
diff --git a/src/xhr.js b/src/xhr.js
index 929c99f9a..9df512b4c 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
 		if ( force || internal ) {
 			
 			// Reset callbacks lists
-			deferred = jQuery.deferred();
-			completeDeferred = jQuery._deferred();
+			deferred = jQuery.Deferred();
+			completeDeferred = jQuery._Deferred();
 			
 			xhr.success = xhr.then = deferred.then;
 			xhr.error = xhr.fail = deferred.fail;
diff --git a/test/unit/core.js b/test/unit/core.js
index e847de1de..1b6b1634a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -905,7 +905,7 @@ test("jQuery.parseJSON", function(){
 	}
 });
 
-test("jQuery._deferred()", function() {
+test("jQuery._Deferred()", function() {
 	
 	expect( 14 );
 	
@@ -913,7 +913,7 @@ test("jQuery._deferred()", function() {
 		object,
 		test;
 	
-	deferred = jQuery._deferred();
+	deferred = jQuery._Deferred();
 		
 	test = false;
 		
@@ -946,7 +946,7 @@ test("jQuery._deferred()", function() {
 	
 	ok( test , "Test manual cancel" );
 	
-	deferred = jQuery._deferred().then( function() {
+	deferred = jQuery._Deferred().then( function() {
 		return false;
 	} );
 	
@@ -961,7 +961,7 @@ test("jQuery._deferred()", function() {
 	ok( test , "Test cancel by returning false" );
 
 	try {
-		deferred = jQuery._deferred().resolve().then( function() {
+		deferred = jQuery._Deferred().resolve().then( function() {
 			throw "Error";
 		} , function() {
 			ok( false , "Test deferred cancel on exception" );
@@ -972,7 +972,7 @@ test("jQuery._deferred()", function() {
 	}
 	
 	test = "";
-	deferred = jQuery._deferred().then( function() {
+	deferred = jQuery._Deferred().then( function() {
 		
 		test += "A";
 		
@@ -1003,7 +1003,7 @@ test("jQuery._deferred()", function() {
 	
 	strictEqual( test , "ABC" , "Test then callbacks order" );
 	
-	deferred = jQuery._deferred( false ).resolve().cancel();
+	deferred = jQuery._Deferred( false ).resolve().cancel();
 	
 	deferred.then( function() {
 		ok( true , "Test non-cancellable deferred not cancelled manually");
@@ -1025,31 +1025,31 @@ test("jQuery._deferred()", function() {
 		deferred.then();
 	}
 	
-	deferred = jQuery._deferred();
+	deferred = jQuery._Deferred();
 	
 	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });
 
-test("jQuery.deferred()", function() {
+test("jQuery.Deferred()", function() {
 	
 	expect( 8 );
 	
-	jQuery.deferred( function( defer ) {
+	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
 		this.resolve( "done" );
 	}).then( function( value ) {
 		strictEqual( value , "done" , "Passed function executed" );
 	});
 	
-	jQuery.deferred().resolve().then( function() {
+	jQuery.Deferred().resolve().then( function() {
 		ok( true , "Success on resolve" );
 	}).fail( function() {
 		ok( false , "Error on resolve" );
 	});
 	
-	jQuery.deferred().reject().then( function() {
+	jQuery.Deferred().reject().then( function() {
 		ok( false , "Success on reject" );
 	}).fail( function() {
 		ok( true , "Error on reject" );
@@ -1057,7 +1057,7 @@ test("jQuery.deferred()", function() {
 	
 	var flag = true;
 	
-	jQuery.deferred().resolve().cancel().then( function() {
+	jQuery.Deferred().resolve().cancel().then( function() {
 		ok( flag = false , "Success on resolve/cancel" );
 	}).fail( function() {
 		ok( flag = false , "Error on resolve/cancel" );
@@ -1067,7 +1067,7 @@ test("jQuery.deferred()", function() {
 	
 	flag = true;
 	
-	jQuery.deferred().reject().cancel().then( function() {
+	jQuery.Deferred().reject().cancel().then( function() {
 		ok( flag = false , "Success on reject/cancel" );
 	}).fail( function() {
 		ok( flag = false , "Error on reject/cancel" );
@@ -1075,13 +1075,13 @@ test("jQuery.deferred()", function() {
 	
 	ok( flag , "Cancel on reject" );
 	
-	jQuery.deferred( false ).resolve().then( function() {
+	jQuery.Deferred( false ).resolve().then( function() {
 		return false;
 	} , function() {
 		ok( true , "Not cancelled on resolve" );
 	});
 	
-	jQuery.deferred( false ).reject().fail( function() {
+	jQuery.Deferred( false ).reject().fail( function() {
 		return false;
 	} , function() {
 		ok( true , "Not cancelled on reject" );
@@ -1099,8 +1099,8 @@ test("jQuery.isDeferred()", function() {
 	object2.then._ = [];
 	
 	// The use case that we want to match
-	ok(jQuery.isDeferred(jQuery._deferred()), "Simple deferred");
-	ok(jQuery.isDeferred(jQuery.deferred()), "Failable deferred");
+	ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
+	ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");
 	
 	// Some other objects
 	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
@@ -1113,7 +1113,7 @@ test("jQuery.isDeferred()", function() {
 	ok(!jQuery.isDeferred(null), "null");
 	ok(!jQuery.isDeferred(undefined), "undefined");
 	
-	object1 = {custom: jQuery._deferred().then};
+	object1 = {custom: jQuery._Deferred().then};
 	
 	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
 	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
@@ -1123,10 +1123,10 @@ test("jQuery.when()", function() {
 	
 	expect( 5 );
 	
-	var cache, i, deferred = { done: jQuery.deferred().resolve( 1 ).then };
+	var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
 	
 	for( i = 1 ; i < 3 ; i++ ) {
-		jQuery.when( cache || jQuery.deferred( function() {
+		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );
 		}) ).then( function( value ) {
 			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );

From fd63416ab191c9c757ba8ca155f2656fcc8ce000 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 01:27:40 +0100
Subject: [PATCH 061/110] Removed a console.log :/

---
 src/xhr.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/xhr.js b/src/xhr.js
index 9df512b4c..991a14501 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -257,8 +257,6 @@ jQuery.xhr = function( _native ) {
 									dataConverters[ ( conversion = prev + " " + current ) ] ||
 									dataConverters[ "* " + current ];
 								
-								console.log( conversion );
-								
 								if ( ! oneConv && prev !== "text" && current !== "text" ) {
 									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
 									conv2 = dataConverters[ "text " + current ];

From 23d455b4469f2b47363c21867aad271d6930f112 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 01:29:04 +0100
Subject: [PATCH 062/110] Deferred cannot be cancelled by returning false in a
 callback. Exception in the callback are still propagated and execution of
 remaining callbacks is still possible.

---
 src/core.js       | 79 +++++++++++++++++++++------------------------
 test/unit/core.js | 81 ++++-------------------------------------------
 2 files changed, 43 insertions(+), 117 deletions(-)

diff --git a/src/core.js b/src/core.js
index 1beebd17b..efb168306 100644
--- a/src/core.js
+++ b/src/core.js
@@ -805,10 +805,7 @@ jQuery.extend({
 	},
 	
 	// Create a simple deferred (one callbacks list)
-	_Deferred: function( cancellable ) {
-		
-		// cancellable by default
-		cancellable = cancellable !== false;
+	_Deferred: function() {
 		
 		var // callbacks list
 			callbacks = [],
@@ -825,7 +822,7 @@ jQuery.extend({
 				then: function () {
 					
 					if ( ! cancelled ) {
-					
+						
 						var args = arguments,
 							i,
 							length,
@@ -852,24 +849,23 @@ jQuery.extend({
 							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
 						}
 					}
+					
 					return this;
 				},
 				
 				// resolve with given context and args
-				// (i is used internally)
-				fire: function( context , args , i ) {
+				fire: function( context , args ) {
 					if ( ! cancelled && ! fired && ! firing ) {
+						
 						firing = 1;
+						
 						try {
-							for( i = 0 ; ! cancelled && callbacks[ i ] ; i++ ) {
-								cancelled = ( callbacks[ i ].apply( context , args ) === false ) && cancellable;
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context , args );
 							}
-						} catch( e ) {
-							cancelled = cancellable;
-							jQuery.error( e );
-						} finally {
+						}
+						finally {
 							fired = [ context , args ];
-							callbacks = cancelled ? [] : callbacks.slice( i + 1 );
 							firing = 0;
 						}
 					}
@@ -882,15 +878,22 @@ jQuery.extend({
 					return this;
 				},
 				
-				// cancelling further callbacks
-				cancel: function() {
-					if ( cancellable ) {
-						callbacks = [];
-						cancelled = 1;
-					}
-					return this;
-				}
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
 				
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				},
+				
+				// Has this deferred been cancelled?
+				isCancelled: function() {
+					return !!cancelled;
+				}
 			};
 		
 		// Add the deferred marker
@@ -901,21 +904,11 @@ jQuery.extend({
 	
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
-	Deferred: function( func , cancellable ) {
+	Deferred: function( func ) {
 		
-		// Handle varargs
-		if ( arguments.length === 1 ) {
-			
-			if ( typeof func === "boolean" ) {
-				cancellable = func;
-				func = 0;
-			}
-		}
-		
-		var errorDeferred = jQuery._Deferred( cancellable ),
-			deferred = jQuery._Deferred( cancellable ),
-			// Keep reference of the cancel method since we'll redefine it
-			cancelThen = deferred.cancel;
+		var errorDeferred = jQuery._Deferred(),
+			deferred = jQuery._Deferred(),
+			successCancel = deferred.cancel;
 			
 		// Add errorDeferred methods and redefine cancel			
 		jQuery.extend( deferred , {
@@ -923,16 +916,16 @@ jQuery.extend({
 				fail: errorDeferred.then,
 				fireReject: errorDeferred.fire,
 				reject: errorDeferred.resolve,
-				cancel: function() {
-					cancelThen();
-					errorDeferred.cancel();
-					return this;
-				}
+				isRejected: errorDeferred.isResolved
 
 		} );
 		
+		// Remove cancel related
+		delete deferred.cancel;
+		delete deferred.isCancelled;
+		
 		// Make sure only one callback list will be used
-		deferred.then( errorDeferred.cancel ).fail( cancelThen );
+		deferred.then( errorDeferred.cancel ).fail( successCancel );
 		
 		// Call given func if any
 		if ( func ) {
@@ -979,7 +972,7 @@ jQuery.extend({
 
 // Create readyList deferred
 // also force $.fn.ready to be recognized as a defer
-readyList = jQuery._Deferred( false );
+readyList = jQuery._Deferred();
 jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
diff --git a/test/unit/core.js b/test/unit/core.js
index 1b6b1634a..196700745 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -907,7 +907,7 @@ test("jQuery.parseJSON", function(){
 
 test("jQuery._Deferred()", function() {
 	
-	expect( 14 );
+	expect( 10 );
 	
 	var deferred,
 		object,
@@ -940,31 +940,19 @@ test("jQuery._Deferred()", function() {
 	test = true;
 	
 	deferred.then( function() {
-		ok( false , "Manual cancel was ignored" );
+		ok( false , "Cancel was ignored" );
 		test = false;
 	} );
 	
-	ok( test , "Test manual cancel" );
+	ok( test , "Test cancel" );
 	
-	deferred = jQuery._Deferred().then( function() {
-		return false;
-	} );
+	deferred = jQuery._Deferred().resolve();
 	
-	deferred.resolve();
-	
-	test = true;
-	
-	deferred.then( function() {
-		test = false;
-	} );
-	
-	ok( test , "Test cancel by returning false" );
-
 	try {
-		deferred = jQuery._Deferred().resolve().then( function() {
+		deferred.then( function() {
 			throw "Error";
 		} , function() {
-			ok( false , "Test deferred cancel on exception" );
+			ok( true , "Test deferred do not cancel on exception" );
 		} );
 	} catch( e ) {
 		strictEqual( e , "Error" , "Test deferred propagates exceptions");
@@ -1003,28 +991,6 @@ test("jQuery._Deferred()", function() {
 	
 	strictEqual( test , "ABC" , "Test then callbacks order" );
 	
-	deferred = jQuery._Deferred( false ).resolve().cancel();
-	
-	deferred.then( function() {
-		ok( true , "Test non-cancellable deferred not cancelled manually");
-		return false;
-	} );
-
-	deferred.then( function() {
-		ok( true , "Test non-cancellable deferred not cancelled by returning false");
-	} );
-	
-	try {
-		deferred.then( function() {
-			throw "Error";
-		} , function() {
-			ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
-		} );
-	} catch( e ) {
-		strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
-		deferred.then();
-	}
-	
 	deferred = jQuery._Deferred();
 	
 	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
@@ -1034,7 +1000,7 @@ test("jQuery._Deferred()", function() {
 
 test("jQuery.Deferred()", function() {
 	
-	expect( 8 );
+	expect( 4 );
 	
 	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
@@ -1054,39 +1020,6 @@ test("jQuery.Deferred()", function() {
 	}).fail( function() {
 		ok( true , "Error on reject" );
 	});
-	
-	var flag = true;
-	
-	jQuery.Deferred().resolve().cancel().then( function() {
-		ok( flag = false , "Success on resolve/cancel" );
-	}).fail( function() {
-		ok( flag = false , "Error on resolve/cancel" );
-	});
-	
-	ok( flag , "Cancel on resolve" );
-	
-	flag = true;
-	
-	jQuery.Deferred().reject().cancel().then( function() {
-		ok( flag = false , "Success on reject/cancel" );
-	}).fail( function() {
-		ok( flag = false , "Error on reject/cancel" );
-	});
-	
-	ok( flag , "Cancel on reject" );
-	
-	jQuery.Deferred( false ).resolve().then( function() {
-		return false;
-	} , function() {
-		ok( true , "Not cancelled on resolve" );
-	});
-	
-	jQuery.Deferred( false ).reject().fail( function() {
-		return false;
-	} , function() {
-		ok( true , "Not cancelled on reject" );
-	});
-	
 });
 	
 test("jQuery.isDeferred()", function() {

From 240d8b681e222dcbc50192331ed7ba00b0e07e0e Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 12:52:53 +0100
Subject: [PATCH 063/110] Removed custom method in isDeferred and when.

---
 src/core.js       | 13 ++++---------
 test/unit/core.js | 25 +++----------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/core.js b/src/core.js
index efb168306..67429f779 100644
--- a/src/core.js
+++ b/src/core.js
@@ -936,20 +936,15 @@ jQuery.extend({
 	},
 
 	// Check if an object is a deferred
-	isDeferred: function( object , method ) {
-		method = method || "then";
-		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	isDeferred: function( object ) {
+		return !!( object && object.then && object.then._ === deferredMarker );
 	},
 	
 	// Deferred helper
-	when: function( object , method ) {
-		method = method || "then";
-		object = jQuery.isDeferred( object , method ) ?
+	when: function( object ) {
+		object = jQuery.isDeferred( object ) ?
 			object :
 			jQuery.Deferred().resolve( object );
-		object.fail = object.fail || function() { return this; };
-		object[ method ] = object[ method ] || object.then;
-		object.then = object.then || object[ method ];
 		return object;
 	},
 
diff --git a/test/unit/core.js b/test/unit/core.js
index 196700745..e0938b68a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1024,7 +1024,7 @@ test("jQuery.Deferred()", function() {
 	
 test("jQuery.isDeferred()", function() {
 	
-	expect( 11 );
+	expect( 10 );
 	
 	var object1 = { then: function() { return this; } },
 		object2 = { then: function() { return this; } };
@@ -1049,14 +1049,13 @@ test("jQuery.isDeferred()", function() {
 	object1 = {custom: jQuery._Deferred().then};
 	
 	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
-	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
 });
 
 test("jQuery.when()", function() {
 	
-	expect( 5 );
+	expect( 2 );
 	
-	var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
+	var cache, i;
 	
 	for( i = 1 ; i < 3 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
@@ -1068,22 +1067,4 @@ test("jQuery.when()", function() {
 			ok( false , "Fail called" );
 		});
 	}
-	
-	cache = 0;
-
-	for( i = 1 ; i < 3 ; i++ ) {
-		jQuery.when( cache || deferred , "done" ).done( function( value ) {
-			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
-			cache = value;
-		}).fail( function() {
-			ok( false , "Custom method: fail called" );
-		});
-	}
-	
-	stop();
-	
-	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
-		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
-		start();
-	});
 });

From 6f53be1839b10486c624e07595533d57c602eda5 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 15:38:33 +0100
Subject: [PATCH 064/110] Removed dataCheckers, added true as possible value
 for dataConverters indicating dataType equivalence (ie. no conversion has to
 be performed).

---
 src/ajax.js | 29 ++-----------------------
 src/xhr.js  | 62 +++++++++++++++++++++--------------------------------
 2 files changed, 27 insertions(+), 64 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 4f1fc6c42..27e8a1f5e 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -197,31 +197,6 @@ jQuery.extend({
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
 		transports: {},
 
-		// Checkers
-		// 1) key is dataType
-		// 2) they are called to control successful response
-		// 3) error throws is used as error data
-		dataCheckers: {
-
-			// Check if data is a string
-			"text": function(data) {
-				if ( typeof data != "string" ) {
-					jQuery.error("typeerror");
-				}
-			},
-
-			// Check if xml has been properly parsed
-			"xml": function(data) {
-				var documentElement = data ? data.documentElement : data;
-				if ( ! documentElement || ! documentElement.nodeName ) {
-					jQuery.error("typeerror");
-				}
-				if ( documentElement.nodeName == "parsererror" ) {
-					jQuery.error("parsererror");
-				}
-			}
-		},
-
 		// List of data converters
 		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
@@ -230,8 +205,8 @@ jQuery.extend({
 			// Convert anything to text
 			"* text": window.String,
 
-			// Text to html (no transformation)
-			"text html": window.String,
+			// Text to html (true = no transformation)
+			"text html": true,
 
 			// Evaluate text as a json expression
 			"text json": jQuery.parseJSON,
diff --git a/src/xhr.js b/src/xhr.js
index 991a14501..b9db71771 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -231,7 +231,6 @@ jQuery.xhr = function( _native ) {
 						oneConv,
 						convertion,
 						dataTypes = s.dataTypes,
-						dataCheckers = s.dataCheckers,
 						dataConverters = s.dataConverters,
 						dataFilter = s.dataFilter,
 						responses = {
@@ -243,51 +242,40 @@ jQuery.xhr = function( _native ) {
 						
 						current = dataTypes[ i ];
 						
-						if ( i ) {
-							
-							prev = dataTypes[ i - 1 ];
-							
-							if ( prev === "*" ) {
-								
-								prev = current;
-								
-							} else if ( current !== "*" && prev !== current ) {
-							
-								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " " + current ) ] ||
-									dataConverters[ "* " + current ];
-								
-								if ( ! oneConv && prev !== "text" && current !== "text" ) {
-									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-									conv2 = dataConverters[ "text " + current ];
-								}
-								if ( oneConv || conv1 && conv2 ) {
-									response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-								} else {
-									throw "no " + conversion;
-								}
-							}
-						}
-						
-						checker = dataCheckers[ current ];
-						
-						if ( response != null && checker ) {
-							checker( response );
-						}
-						
 						if ( responses[ current ] ) {
 							xhr[ "response" + responses[ current ] ] = response;
 							responses[ current ] = 0;
 						}
 						
-						if ( ! i && dataFilter ) {
+						if ( i ) {
 							
-							response = dataFilter( response );
+							if ( prev !== "*" && current !== "*" && prev !== current ) {
 							
+								oneConv = conv1 = 
+									dataConverters[ ( conversion = prev + " " + current ) ] ||
+									dataConverters[ "* " + current ];
+								
+								if ( oneConv !== true ) {
+									
+									if ( ! oneConv && prev !== "text" && current !== "text" ) {
+										conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+										conv2 = dataConverters[ "text " + current ];
+									}
+									
+									if ( oneConv || conv1 && conv2 ) {
+										response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+									} else {
+										throw "no " + conversion;
+									}
+								}
+							}
+						} else if ( dataFilter ) {
+							
+							response = s.dataFilter( response );
 							dataTypes = s.dataTypes;
-							dataFilter = 0;
-							i--;
 						}
+						
+						prev = current;
 					}
 
 					// We have a real success

From 981d1e08eb00f4b5c29ad1f3977a45e30c93ad70 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 18:54:37 +0100
Subject: [PATCH 065/110] Removed re-usability from jXHR object (no more open,
 send & onreadystatechange support). Streamlined the implementation and put it
 back into ajax.js (removed xhr.js in the process). Went back to a more simple
 & direct approach to options handling (keeping much room to further
 minification-related optimizations). Code is cleaner, smaller & faster.
 Removed & edited unit tests accordingly. All build files have had xhr.js
 removed.

---
 Makefile                 |   1 -
 Rakefile                 |   1 -
 build.xml                |   1 -
 src/ajax.js              | 586 ++++++++++++++++++++++++++++++-
 src/transports/jsonp.js  |   2 +-
 src/transports/script.js |   2 +-
 src/transports/xhr.js    |   2 +-
 src/xhr.js               | 728 ---------------------------------------
 test/index.html          |   1 -
 test/unit/ajax.js        | 166 +--------
 10 files changed, 583 insertions(+), 907 deletions(-)
 delete mode 100644 src/xhr.js

diff --git a/Makefile b/Makefile
index 5792bb478..cf985549b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.js\
-	${SRC_DIR}/xhr.js\
 	${SRC_DIR}/transports/jsonp.js\
 	${SRC_DIR}/transports/script.js\
 	${SRC_DIR}/transports/xhr.js\
diff --git a/Rakefile b/Rakefile
index 52d789952..fd5fc1813 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,7 +22,6 @@ base_files = %w{
   manipulation
   css
   ajax
-  xhr
   transports/jsonp
   transports/script
   transports/xhr
diff --git a/build.xml b/build.xml
index 6a28aa849..d4cd39d0d 100644
--- a/build.xml
+++ b/build.xml
@@ -63,7 +63,6 @@
 			<fileset file="src/manipulation.js" />
 			<fileset file="src/css.js" />
 			<fileset file="src/ajax.js" />
-			<fileset file="src/xhr.js" />
 			<fileset file="src/transports/jsonp.js" />
 			<fileset file="src/transports/script.js" />
 			<fileset file="src/transports/xhr.js" />
diff --git a/src/ajax.js b/src/ajax.js
index 27e8a1f5e..347273d15 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,12 +1,20 @@
 (function( jQuery ) {
-
-var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	
+var r20 = /%20/g,
 	rbracket = /\[\]$/,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	rnoContent = /^(?:GET|HEAD)$/,
 	rquery = /\?/,
-	r20 = /%20/g,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 
+	// Slice function
+	sliceFunc = Array.prototype.slice,
+	
 	// Keep a copy of the old load method
 	_load = jQuery.fn.load;
 
@@ -217,15 +225,407 @@ jQuery.extend({
 	},
 
 	// Main method
-	ajax: function( url , s ) {
-
+	// (s is used internally)
+	ajax: function( url , options , s ) {
+		
+		// Handle varargs
 		if ( arguments.length === 1 ) {
-			s = url;
-			url = s ? s.url : undefined;
+			options = url;
+			url = options ? options.url : undefined;
+		}
+		
+		// Force options to be an object
+		options = options || {};
+		
+		// Get the url if provided separately
+		options.url = url || options.url;
+		
+		// Create the final options object
+		s = jQuery.extend( true , {} , jQuery.ajaxSettings , options );
+		
+		// We force the original context
+		// (plain objects used as context get extended)
+		s.context = options.context;
+		
+		var // jQuery lists
+			jQuery_lastModified = jQuery.lastModified,
+			jQuery_etag = jQuery.etag,
+			// Callbacks contexts
+			callbackContext = s.context || s,
+			globalEventContext = s.context ? jQuery( s.context ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// The jXHR state
+			state = 0,
+			// Loop variable
+			i,
+			// Fake xhr
+			jXHR = {
+				
+				readyState: 0,
+				
+				// Caches the header
+				setRequestHeader: function(name,value) {
+					if ( state === 0 ) {
+						requestHeaders[ name.toLowerCase() ] = value;
+					}
+					return this;
+				},
+				
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+				
+				// Builds headers hashtable if needed
+				// (match is used internally)
+				getResponseHeader: function( key , match ) {
+					
+					if ( state !== 2 ) {
+						return null;
+					}
+					
+					if ( responseHeaders === undefined ) {
+						
+						responseHeaders = {};
+						
+						if ( typeof responseHeadersString === "string" ) {
+							
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+							}
+						}
+					}
+					return responseHeaders[ key.toLowerCase() ];
+				},
+				
+				// Cancel the request
+				abort: function( statusText ) {
+					if ( transport && state !== 2 ) {
+						transport.abort( statusText || "abort" );
+						done( 0 , statusText );
+					}
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status , statusText , response , headers) {
+			
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+			
+			// State is "done" now
+			state = 2;
+			
+			// Set readyState
+			jXHR.readyState = status ? 4 : 0;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout(timeoutTimer);
+			}
+			
+			var // Reference url
+				url = s.url,
+				// and ifModified status
+				ifModified = s.ifModified,
+				
+				// Is it a success?
+				isSuccess = 0,
+				// Stored success
+				success,
+				// Stored error
+				error = statusText;
+			
+			// If not timeout, force a jQuery-compliant status text
+			if ( statusText != "timeout" ) {
+				statusText = ( status >= 200 && status < 300 ) ? 
+					"success" :
+					( status === 304 ? "notmodified" : "error" );
+			}
+			
+			// If successful, handle type chaining
+			if ( statusText === "success" || statusText === "notmodified" ) {
+				
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					
+					var lastModified = jXHR.getResponseHeader("Last-Modified"),
+						etag = jXHR.getResponseHeader("Etag");
+						
+					if (lastModified) {
+						jQuery_lastModified[ s.url ] = lastModified;
+					}
+					if (etag) {
+						jQuery_etag[ s.url ] = etag;
+					}
+				}
+				
+				if ( s.ifModified && statusText === "notmodified" ) {
+					
+					success = null;
+					isSuccess = 1;
+					
+				} else {
+					// Chain data conversions and determine the final value
+					// (if an exception is thrown in the process, it'll be notified as an error)
+					try {
+						
+						var i,
+							current,
+							prev,
+							checker,
+							conv1,
+							conv2,
+							oneConv,
+							convertion,
+							dataTypes = s.dataTypes,
+							dataConverters = s.dataConverters,
+							responses = {
+								"xml": "XML",
+								"text": "Text"
+							};
+						
+						for( i = 0 ; i < dataTypes.length ; i++ ) {
+							
+							current = dataTypes[ i ];
+							
+							if ( responses[ current ] ) {
+								jXHR[ "response" + responses[ current ] ] = response;
+								responses[ current ] = 0;
+							}
+							
+							if ( i ) {
+								
+								if ( prev !== "*" && current !== "*" && prev !== current ) {
+								
+									oneConv = conv1 = 
+										dataConverters[ ( conversion = prev + " " + current ) ] ||
+										dataConverters[ "* " + current ];
+									
+									if ( oneConv !== true ) {
+										
+										if ( ! oneConv && prev !== "text" && current !== "text" ) {
+											conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+											conv2 = dataConverters[ "text " + current ];
+										}
+										
+										if ( oneConv || conv1 && conv2 ) {
+											response = oneConv ? conv1( response ) : conv2( conv1( response ) );
+										} else {
+											throw "no " + conversion;
+										}
+									}
+								}
+							} else if ( s.dataFilter ) {
+								
+								response = s.dataFilter( response );
+								dataTypes = s.dataTypes;
+							}
+							
+							prev = current;
+						}
+		
+						// We have a real success
+						success = response;
+						isSuccess = 1;
+						
+					} catch(e) {
+						
+						statusText = "parsererror";
+						error = "" + e;
+						
+					}
+				}
+				
+			} else { // if not success, mark it as an error
+				
+					error = error || statusText;
+			}
+				
+			// Set data for the fake xhr object
+			jXHR.status = status;
+			jXHR.statusText = statusText;
+			
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.fire( callbackContext , [ success , statusText , jXHR ] );
+			} else {
+				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
+			}
+			
+			if ( s.global ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
+						[ jXHR , s , isSuccess ? success : error ] );
+			}
+			
+			// Complete
+			completeDeferred.fire( callbackContext, [ jXHR , statusText ] );
+			
+			if ( s.global ) {
+				globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] );
+				// Handle the global AJAX counter
+				if ( ! --jQuery.active ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+		
+		// Attach deferreds	
+		jXHR.success = jXHR.then = deferred.then;
+		jXHR.error = jXHR.fail = deferred.fail;
+		jXHR.complete = completeDeferred.then;
+
+		// Remove hash character (#7531: and string promotion)
+		s.url = ( "" + s.url ).replace( rhash , "" );
+		
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+		
+		// Determine if request has content
+		s.hasContent = ! rnoContent.test( s.type );
+		
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
+		
+		// Determine if a cross-domain request is in order
+		var parts = rurl.exec( s.url.toLowerCase() ),
+			loc = location;
+		s.crossDomain = !!( parts && ( parts[ 1 ] && parts[ 1 ] != loc.protocol || parts[ 2 ] != loc.host ) );
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data != "string" ) {
+			s.data = jQuery.param( s.data , s.traditional );
 		}
 
-		return jQuery.xhr().open( s ? s.type : undefined , url ).send( undefined , s );
+		// Watch for a new set of requests
+		if ( s.global && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+		
+		// Get transport
+		transport = jQuery.ajax.prefilter( s ).transport( s );
+		
+		// If no transport, we auto-abort
+		if ( ! transport ) {
+			
+			done( 0 , "transport not found" );
+			jXHR = false;
+			
+		} else {
+			
+			// More options handling for requests with no content
+			if ( ! s.hasContent ) {
+				
+				// If data is available, append data to url
+				if ( s.data ) {
+					s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				}
+								
+				// Add anti-cache in url if needed
+				if ( s.cache === false ) {
+					
+					var ts = jQuery.now(),
+						// try replacing _= if it is there
+						ret = s.url.replace( rts , "$1_=" + ts );
+						
+					// if nothing was replaced, add timestamp to the end
+					s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
+				}
+			}
+			
+			// Set the correct header, if data is being sent
+			if ( ( s.data && s.hasContent ) || options.contentType ) {
+				requestHeaders[ "content-type" ] = s.contentType;
+			}
+		
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery_lastModified[ s.url ] ) { 
+					requestHeaders[ "if-modified-since" ] = jQuery_lastModified[ s.url ];
+				}
+				if ( jQuery_etag[ s.url ] ) {
+					requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
+				}
+			}
+		
+			// Set the Accepts header for the server, depending on the dataType
+			requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+				s.accepts[ "*" ];
+				
+			// Check for headers option
+			for ( i in s.headers ) {
+				requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
+			}
+			
+			// Allow custom headers/mimetypes and early abort
+			if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
+					
+					// Abort if not done already
+					done( 0 , "abort" );
+					jXHR = false;
+					
+			} else {
+				
+				// Set state as sending
+				state = 1;
+				jXHR.readyState = 1;
+				
+				// Install callbacks on deferreds
+				for ( i in { success:1, error:1, complete:1 } ) {
+					jXHR[ i ]( s[ i ] );
+				}
+				
+				// Send global event
+				if ( s.global ) {
+					globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] );
+				}
+				
+				// Timeout
+				if ( s.async && s.timeout > 0 ) {
+					timeoutTimer = setTimeout(function(){
+						jXHR.abort( "timeout" );
+					}, s.timeout);
+				}
+				
+				// Try to send
+				try {
+					transport.send(requestHeaders, done);
+				} catch (e) {
+					// Propagate exception as error if not done
+					if ( status === 1 ) {
 
+						done(0, "error", "" + e);
+						jXHR = false;
+						
+					// Simply rethrow otherwise
+					} else {
+						jQuery.error(e);
+					}
+				}
+			}
+		}
+		
+		return jXHR;
 	},
 
 	// Serialize an array of form elements or a set of
@@ -315,6 +715,172 @@ jQuery.extend({
 
 });
 
+//Execute or select from functions in a given structure of options
+function ajax_selectOrExecute( structure , s ) {
+
+	var dataTypes = s.dataTypes,
+		transportDataType,
+		list,
+		selected,
+		i,
+		length,
+		checked = {},
+		flag,
+		noSelect = structure !== "transports";
+		
+	function initSearch( dataType ) {
+
+		flag = transportDataType !== dataType && ! checked[ dataType ];
+		
+		if ( flag ) {
+			
+			checked[ dataType ] = 1;
+			transportDataType = dataType;
+			list = s[ structure ][ dataType ];
+			i = -1;
+			length = list ? list.length : 0 ;
+		}
+
+		return flag;
+	}
+	
+	initSearch( dataTypes[ 0 ] );
+
+	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
+		
+		if ( i === length ) {
+			
+			initSearch( "*" );
+			
+		} else {
+
+			selected = list[ i ]( s , determineDataType );
+
+			// If we got redirected to another dataType
+			// Search there (if not in progress or already tried)
+			if ( typeof( selected ) === "string" &&
+				initSearch( selected ) ) {
+
+				dataTypes.unshift( selected );
+				selected = 0;
+			}
+		}
+	}
+
+	return noSelect ? jQuery.ajax : selected;
+}
+
+// Add an element to one of the structures in ajaxSettings
+function ajax_addElement( structure , args ) {
+		
+	var i,
+		start = 0,
+		length = args.length,
+		dataTypes = [ "*" ],
+		dLength = 1,
+		dataType,
+		functors = [],
+		first,
+		append,
+		list;
+		
+	if ( length ) {
+		
+		first = jQuery.type( args[ 0 ] );
+		
+		if ( first === "object" ) {
+			return ajax_selectOrExecute( structure , args[ 0 ] );
+		}
+		
+		structure = jQuery.ajaxSettings[ structure ];
+		
+		if ( first !== "function" ) {
+			
+			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
+			dLength = dataTypes.length;
+			start = 1;
+			
+		}
+		
+		if ( dLength && start < length ) {
+			
+			functors = sliceFunc.call( args , start );
+					
+			for( i = 0 ; i < dLength ; i++ ) {
+				
+				dataType = dataTypes[ i ];
+				
+				first = /^\+/.test( dataType );
+				
+				if (first) {
+					dataType = dataType.substr(1);
+				}
+				
+				if ( dataType !== "" ) {
+				
+					append = Array.prototype[ first ? "unshift" : "push" ];
+					list = structure[ dataType ] = structure[ dataType ] || [];
+					append.apply( list , functors );
+				}
+			}
+		}
+	}
+	
+	return jQuery.ajax;
+}
+
+// Install prefilter & transport methods
+jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
+	_ = name + "s";
+	jQuery.ajax[ name ] = function() {
+		return ajax_addElement( _ , arguments );
+	};
+} );
+	
+// Utility function that handles dataType when response is received
+// (for those transports that can give text or xml responses)
+function determineDataType( s , ct , text , xml ) {
+	
+	var autoDataType = s.autoDataType,
+		type,
+		regexp,
+		dataTypes = s.dataTypes,
+		transportDataType = dataTypes[0],
+		response;
+	
+	// Auto (xml, json, script or text determined given headers)
+	if ( transportDataType === "*" ) {
+
+		for ( type in autoDataType ) {
+			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
+				transportDataType = dataTypes[0] = type;
+				break;
+			}
+		}			
+	} 
+	
+	// xml and parsed as such
+	if ( transportDataType === "xml" &&
+		xml &&
+		xml.documentElement /* #4958 */ ) {
+		
+		response = xml;
+	
+	// Text response was provided
+	} else {
+		
+		response = text;
+		
+		// If it's not really text, defer to dataConverters
+		if ( transportDataType !== "text" ) {
+			dataTypes.unshift( "text" );
+		}
+		
+	}
+	
+	return response;
+}	
+
 /*
  * Create the request object; Microsoft failed to properly
  * implement the XMLHttpRequest in IE7 (can't request local files),
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index a685bb196..f16b394ba 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -14,7 +14,7 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 // 2) sneakily ensure transportDataType is json
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
-jQuery.xhr.prefilter("json jsonp", function(s) {
+jQuery.ajax.prefilter("json jsonp", function(s) {
 	
 	var transportDataType = s.dataTypes[ 0 ];
 	
diff --git a/src/transports/script.js b/src/transports/script.js
index 4f55dc5ad..ddfaf3682 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -17,7 +17,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 } );
 
 // Bind script tag hack transport
-jQuery.xhr.transport("script", function(s) {
+jQuery.ajax.transport("script", function(s) {
 	
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 978f6c259..5845087b8 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrUnloadAbortMarker = [];
 
 	
-jQuery.xhr.transport( function( s , determineDataType ) {
+jQuery.ajax.transport( function( s , determineDataType ) {
 	
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
diff --git a/src/xhr.js b/src/xhr.js
deleted file mode 100644
index b9db71771..000000000
--- a/src/xhr.js
+++ /dev/null
@@ -1,728 +0,0 @@
-(function( jQuery ) {
-
-var rquery_xhr = /\?/,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
-	rnoContent = /^(?:GET|HEAD)$/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	
-	sliceFunc = Array.prototype.slice;
-	
-// Creates a jQuery xhr object
-jQuery.xhr = function( _native ) {
-
-	if ( _native ) {
-		return jQuery.ajaxSettings.xhr();
-	}
-	
-	function reset( force ) {
-		
-		// We only need to reset if we went through the init phase
-		// (with the exception of object creation)
-		if ( force || internal ) {
-			
-			// Reset callbacks lists
-			deferred = jQuery.Deferred();
-			completeDeferred = jQuery._Deferred();
-			
-			xhr.success = xhr.then = deferred.then;
-			xhr.error = xhr.fail = deferred.fail;
-			xhr.complete = completeDeferred.then;
-			
-			// Reset private variables
-			requestHeaders = {};
-			responseHeadersString = responseHeaders = internal = done = timeoutTimer = s = undefined;
-
-			// Reset state
-			xhr.readyState = 0;
-			sendFlag = 0;
-
-			// Remove responseX fields
-			for ( var name in xhr ) {
-				if ( /^response/.test(name) ) {
-					delete xhr[name];
-				}
-			}
-		}
-	}
-
-	function init() {
-
-		var // Options extraction
-
-			// Remove hash character (#7531: first for string promotion)
-			url = s.url = ( "" + s.url ).replace( rhash , "" ),
-
-			// Uppercase the type
-			type = s.type = s.type.toUpperCase(),
-
-			// Determine if request has content
-			hasContent = s.hasContent = ! rnoContent.test( type ),
-
-			// Extract dataTypes list
-			dataType = s.dataType,
-			dataTypes = s.dataTypes = dataType ? jQuery.trim(dataType).toLowerCase().split(/\s+/) : ["*"],
-
-			// Determine if a cross-domain request is in order
-			parts = rurl.exec( url.toLowerCase() ),
-			loc = location,
-			crossDomain = s.crossDomain = !!( parts && ( parts[1] && parts[1] != loc.protocol || parts[2] != loc.host ) ),
-
-			// Get other options locally
-			data = s.data,
-			originalContentType = s.contentType,
-			prefilters = s.prefilters,
-			accepts = s.accepts,
-			headers = s.headers,
-
-			// Other Variables
-			transportDataType,
-			i;
-
-		// Convert data if not already a string
-		if ( data && s.processData && typeof data != "string" ) {
-			data = s.data = jQuery.param( data , s.traditional );
-		}
-
-		// Get internal
-		internal = jQuery.xhr.prefilter( s ).transport( s );
-		
-		// Re-actualize url & data
-		url = s.url;
-		data = s.data;
-
-		// If internal was found
-		if ( internal ) {
-
-			// Get transportDataType
-			transportDataType = dataTypes[0];
-
-			// More options handling for requests with no content
-			if ( ! hasContent ) {
-
-				// If data is available, append data to url
-				if ( data ) {
-					url += (rquery_xhr.test(url) ? "&" : "?") + data;
-				}
-
-				// Add anti-cache in url if needed
-				if ( s.cache === false ) {
-
-					var ts = jQuery.now(),
-						// try replacing _= if it is there
-						ret = url.replace(rts, "$1_=" + ts );
-
-					// if nothing was replaced, add timestamp to the end
-					url = ret + ((ret == url) ? (rquery_xhr.test(url) ? "&" : "?") + "_=" + ts : "");
-				}
-
-				s.url = url;
-			}
-
-			// Set the correct header, if data is being sent
-			if ( ( data && hasContent ) || originalContentType ) {
-				requestHeaders["content-type"] = s.contentType;
-			}
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery_lastModified[url] ) {
-					requestHeaders["if-modified-since"] = jQuery_lastModified[url];
-				}
-				if ( jQuery_etag[url] ) {
-					requestHeaders["if-none-match"] = jQuery_etag[url];
-				}
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			requestHeaders.accept = transportDataType && accepts[ transportDataType ] ?
-				accepts[ transportDataType ] + ( transportDataType !== "*" ? ", */*; q=0.01" : "" ) :
-				accepts[ "*" ];
-
-			// Check for headers option
-			for ( i in headers ) {
-				requestHeaders[ i.toLowerCase() ] = headers[ i ];
-			}
-		}
-		
-		callbackContext = s.context || s;
-		globalEventContext = s.context ? jQuery(s.context) : jQuery.event;
-		
-		for ( i in { success:1, error:1, complete:1 } ) {
-			xhr[ i ]( s[ i ] );
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		done = whenDone;
-	}
-
-	function whenDone(status, statusText, response, headers) {
-
-		// Called once
-		done = undefined;
-
-		// Reset sendFlag
-		sendFlag = 0;
-
-		// Cache response headers
-		responseHeadersString = headers || "";
-
-		// Clear timeout if it exists
-		if ( timeoutTimer ) {
-			clearTimeout(timeoutTimer);
-		}
-
-		var // Reference url
-			url = s.url,
-			// and ifModified status
-			ifModified = s.ifModified,
-
-			// Is it a success?
-			isSuccess = 0,
-			// Stored success
-			success,
-			// Stored error
-			error = statusText;
-
-		// If not timeout, force a jQuery-compliant status text
-		if ( statusText != "timeout" ) {
-			statusText = ( status >= 200 && status < 300 ) ?
-				"success" :
-				( status === 304 ? "notmodified" : "error" );
-		}
-
-		// If successful, handle type chaining
-		if ( statusText === "success" || statusText === "notmodified" ) {
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( ifModified ) {
-				var lastModified = xhr.getResponseHeader("Last-Modified"),
-					etag = xhr.getResponseHeader("Etag");
-
-				if (lastModified) {
-					jQuery_lastModified[url] = lastModified;
-				}
-				if (etag) {
-					jQuery_etag[url] = etag;
-				}
-			}
-
-			if ( ifModified && statusText === "notmodified" ) {
-
-				success = null;
-				isSuccess = 1;
-
-			} else {
-				// Chain data conversions and determine the final value
-				// (if an exception is thrown in the process, it'll be notified as an error)
-				try {
-					
-					var i,
-						current,
-						prev,
-						checker,
-						conv1,
-						conv2,
-						oneConv,
-						convertion,
-						dataTypes = s.dataTypes,
-						dataConverters = s.dataConverters,
-						dataFilter = s.dataFilter,
-						responses = {
-							"xml": "XML",
-							"text": "Text"
-						};
-					
-					for( i = 0 ; i < dataTypes.length ; i++ ) {
-						
-						current = dataTypes[ i ];
-						
-						if ( responses[ current ] ) {
-							xhr[ "response" + responses[ current ] ] = response;
-							responses[ current ] = 0;
-						}
-						
-						if ( i ) {
-							
-							if ( prev !== "*" && current !== "*" && prev !== current ) {
-							
-								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " " + current ) ] ||
-									dataConverters[ "* " + current ];
-								
-								if ( oneConv !== true ) {
-									
-									if ( ! oneConv && prev !== "text" && current !== "text" ) {
-										conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-										conv2 = dataConverters[ "text " + current ];
-									}
-									
-									if ( oneConv || conv1 && conv2 ) {
-										response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-									} else {
-										throw "no " + conversion;
-									}
-								}
-							}
-						} else if ( dataFilter ) {
-							
-							response = s.dataFilter( response );
-							dataTypes = s.dataTypes;
-						}
-						
-						prev = current;
-					}
-
-					// We have a real success
-					success = response;
-					isSuccess = 1;
-
-				} catch(e) {
-
-					statusText = "parsererror";
-					error = "" + e;
-
-				}
-			}
-
-		} else { // if not success, mark it as an error
-
-				error = error || statusText;
-
-		}
-
-		// Set data for the fake xhr object
-		xhr.status = status;
-		xhr.statusText = statusText;
-
-		// Keep local copies of vars in case callbacks re-use the xhr
-		var _s = s,
-			_deferred = deferred,
-			_completeDeferred = completeDeferred,
-			_callbackContext = callbackContext,
-			_globalEventContext = globalEventContext;
-			
-			
-		// Set state if the xhr hasn't been re-used
-		function _setState( value ) {
-			if ( xhr.readyState && s === _s ) {
-				setState( value );
-			}
-		}
-
-		// Really completed?
-		if ( status && s.async ) {
-			setState( 2 );
-			_setState( 3 );
-		}
-
-		// We're done
-		_setState( 4 );
-		
-		// Success/Error
-		if ( isSuccess ) {
-			_deferred.fire( _callbackContext , [ success , statusText , xhr ] );
-		} else {
-			_deferred.fireReject( _callbackContext , [ xhr , statusText , error ] );
-		}
-		
-		if ( _s.global ) {
-			_globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , [ xhr , _s , isSuccess ? success : error ] );
-		}
-		
-		// Complete
-		_completeDeferred.fire( _callbackContext, [ xhr , statusText ] );
-		
-		if ( _s.global ) {
-			_globalEventContext.trigger( "ajaxComplete", [xhr, _s] );
-			// Handle the global AJAX counter
-			if ( ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-	}
-
-	// Ready state control
-	function checkState( expected , test ) {
-		if ( expected !== true && ( expected === false || test === false || xhr.readyState !== expected ) ) {
-			jQuery.error("INVALID_STATE_ERR");
-		}
-	}
-
-	// Ready state change
-	function setState( value ) {
-		xhr.readyState = value;
-		if ( jQuery.isFunction( xhr.onreadystatechange ) ) {
-			xhr.onreadystatechange();
-		}
-	}
-
-	var // jQuery lists
-		jQuery_lastModified = jQuery.lastModified,
-		jQuery_etag = jQuery.etag,
-		// Options object
-		s,
-		// Callback stuff
-		callbackContext,
-		globalEventContext,
-		deferred,
-		completeDeferred,
-		// Headers (they are sent all at once)
-		requestHeaders,
-		// Response headers
-		responseHeadersString,
-		responseHeaders,
-		// Done callback
-		done,
-		// transport
-		internal,
-		// timeout handle
-		timeoutTimer,
-		// The send flag
-		sendFlag,
-		// Fake xhr
-		xhr = {
-			// state
-			readyState: 0,
-
-			// Callback
-			onreadystatechange: null,
-
-			// Open
-			open: function(type, url, async, username, password) {
-
-				xhr.abort();
-				reset();
-
-				s = {
-					type: type,
-					url: url,
-					async: async,
-					username: username,
-					password: password
-				};
-
-				setState(1);
-
-				return xhr;
-			},
-
-			// Send
-			send: function(data, moreOptions) {
-
-				checkState(1 , !sendFlag);
-
-				s.data = data;
-
-				s = jQuery.extend( true,
-					{},
-					jQuery.ajaxSettings,
-					s,
-					moreOptions || ( moreOptions === false ? { global: false } : {} ) );
-
-				if ( moreOptions ) {
-					// We force the original context
-					// (plain objects used as context get extended)
-					s.context = moreOptions.context;
-				}
-
-				init();
-
-				// If not internal, abort
-				if ( ! internal ) {
-					done( 0 , "transport not found" );
-					return false;
-				}
-
-				// Allow custom headers/mimetypes and early abort
-				if ( s.beforeSend ) {
-
-					var _s = s;
-
-					if ( s.beforeSend.call(callbackContext, xhr, s) === false || ! xhr.readyState || _s !== s ) {
-
-						// Abort if not done
-						if ( xhr.readyState && _s === s ) {
-							xhr.abort();
-						}
-
-						// Handle the global AJAX counter
-						if ( _s.global && ! --jQuery.active ) {
-							jQuery.event.trigger( "ajaxStop" );
-						}
-
-						return false;
-					}
-				}
-
-				sendFlag = 1;
-
-				// Send global event
-				if ( s.global ) {
-					globalEventContext.trigger("ajaxSend", [xhr, s]);
-				}
-
-				// Timeout
-				if ( s.async && s.timeout > 0 ) {
-					timeoutTimer = setTimeout(function(){
-						xhr.abort("timeout");
-					}, s.timeout);
-				}
-
-				if ( s.async ) {
-					setState(1);
-				}
-
-				try {
-
-					internal.send(requestHeaders, done);
-					return xhr;
-
-				} catch (e) {
-
-					if ( done ) {
-
-						done(0, "error", "" + e);
-
-					} else {
-
-						jQuery.error(e);
-
-					}
-				}
-
-				return false;
-			},
-
-			// Caches the header
-			setRequestHeader: function(name,value) {
-				checkState(1, !sendFlag);
-				requestHeaders[ name.toLowerCase() ] = value;
-				return xhr;
-			},
-
-			// Raw string
-			getAllResponseHeaders: function() {
-				return xhr.readyState <= 1 ? "" : responseHeadersString;
-			},
-
-			// Builds headers hashtable if needed
-			getResponseHeader: function( key ) {
-
-				if ( xhr.readyState <= 1 ) {
-
-					return null;
-
-				}
-
-				if ( responseHeaders === undefined ) {
-
-					responseHeaders = {};
-
-					if ( typeof responseHeadersString === "string" ) {
-
-						var match;
-
-						while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-							responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
-						}
-					}
-				}
-				return responseHeaders[ key.toLowerCase() ];
-			},
-
-			// Cancel the request
-			abort: function(statusText) {
-				if (internal) {
-					internal.abort( statusText || "abort" );
-				}
-				xhr.readyState = 0;
-			}
-		};
-
-	// Init data (so that we can bind callbacks early
-	reset(1);
-
-	// Return the xhr emulation
-	return xhr;
-};
-
-// Execute or select from functions in a given structure of options
-function xhr_selectOrExecute( structure , s ) {
-
-	var dataTypes = s.dataTypes,
-		transportDataType,
-		list,
-		selected,
-		i,
-		length,
-		checked = {},
-		flag,
-		noSelect = structure !== "transports";
-		
-	function initSearch( dataType ) {
-
-		flag = transportDataType !== dataType && ! checked[ dataType ];
-
-		if ( flag ) {
-
-			checked[ dataType ] = 1;
-			transportDataType = dataType;
-			list = s[ structure ][ dataType ];
-			i = -1;
-			length = list ? list.length : 0 ;
-		}
-
-		return flag;
-	}
-
-	initSearch( dataTypes[ 0 ] );
-
-	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
-		
-		if ( i === length ) {
-
-			initSearch( "*" );
-
-		} else {
-
-			selected = list[ i ]( s , determineDataType );
-
-			// If we got redirected to another dataType
-			// Search there (if not in progress or already tried)
-			if ( typeof( selected ) === "string" &&
-				initSearch( selected ) ) {
-
-				dataTypes.unshift( selected );
-				selected = 0;
-			}
-		}
-	}
-
-	return noSelect ? jQuery.xhr : selected;
-}
-
-// Add an element to one of the xhr structures in ajaxSettings
-function xhr_addElement( structure , args ) {
-		
-	var i,
-		j,
-		start = 0,
-		length = args.length,
-		dataTypes = [ "*" ],
-		dLength = 1,
-		dataType,
-		functors = [],
-		first,
-		append,
-		list;
-		
-	if ( length ) {
-		
-		first = jQuery.type( args[ 0 ] );
-		
-		if ( first === "object" ) {
-			return xhr_selectOrExecute( structure , args[ 0 ] );
-		}
-		
-		structure = jQuery.ajaxSettings[ structure ];
-		
-		if ( first !== "function" ) {
-			
-			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-			dLength = dataTypes.length;
-			start = 1;
-			
-		}
-		
-		if ( dLength && start < length ) {
-			
-			functors = sliceFunc.call( args , start );
-			
-			length -= start;
-					
-			for( i = 0 ; i < dLength ; i++ ) {
-				
-				dataType = dataTypes[ i ];
-				
-				first = /^\+/.test( dataType );
-				
-				if (first) {
-					dataType = dataType.substr(1);
-				}
-				
-				if ( dataType !== "" ) {
-				
-					append = Array.prototype[ first ? "unshift" : "push" ];
-					
-					list = structure[ dataType ] = structure[ dataType ] || [];
-			
-					for ( j = 0; j < length; j++ ) {
-						append.call( list , functors[ j ] );
-					}
-				}
-			}
-		}
-	}
-	
-	return jQuery.xhr;
-}
-
-// Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-	_ = name + "s";
-	jQuery.xhr[ name ] = function() {
-		return xhr_addElement( _ , arguments );
-	};
-} );
-	
-// Utility function that handles dataType when response is received
-// (for those transports that can give text or xml responses)
-function determineDataType( s , ct , text , xml ) {
-
-	var autoDataType = s.autoDataType,
-		type,
-		regexp,
-		dataTypes = s.dataTypes,
-		transportDataType = dataTypes[0],
-		response;
-
-	// Auto (xml, json, script or text determined given headers)
-	if ( transportDataType === "*" ) {
-
-		for ( type in autoDataType ) {
-			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
-				transportDataType = dataTypes[0] = type;
-				break;
-			}
-		}
-	}
-
-	// xml and parsed as such
-	if ( transportDataType === "xml" &&
-		xml &&
-		xml.documentElement /* #4958 */ ) {
-
-		response = xml;
-
-	// Text response was provided
-	} else {
-
-		response = text;
-
-		// If it's not really text, defer to dataConverters
-		if ( transportDataType !== "text" ) {
-			dataTypes.unshift( "text" );
-		}
-
-	}
-
-	return response;
-}
-
-})( jQuery );
diff --git a/test/index.html b/test/index.html
index 238b7d582..accd349f9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,7 +20,6 @@
 	<script src="../src/manipulation.js"></script>
 	<script src="../src/css.js"></script>
 	<script src="../src/ajax.js"></script>
-	<script src="../src/xhr.js"></script>
 	<script src="../src/transports/jsonp.js"></script>
 	<script src="../src/transports/script.js"></script>
 	<script src="../src/transports/xhr.js"></script>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 88d66bf47..1a1ec3321 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -73,8 +73,8 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
 test("jQuery.ajax() - success/error callbacks (remote)", function() {
 
 	var supports = jQuery.support.cors;
-
-	expect( supports ? 9 : 6 );
+	
+	expect( supports ? 9 : 4 );
 
 	jQuery.ajaxSetup({ timeout: 0 });
 
@@ -102,8 +102,8 @@ test("jQuery.ajax() - success/error callbacks (remote)", function() {
 			dataType: "text",
 			beforeSend: function(){ ok(supports, "beforeSend"); },
 			success: function( val ){ ok(supports, "success"); ok(supports && val.length, "data received"); },
-			error: function(_ , a , b ){ ok(!supports, "error"); },
-			complete: function(){ ok(true, "complete"); }
+			error: function(_ , a , b ){ ok(false, "error"); },
+			complete: function(){ ok(supports, "complete"); }
 		});
 	}, 13);
 });
@@ -409,136 +409,6 @@ test("jQuery.ajax() - abort", function() {
 	equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
 });
 
-test("jQuery.ajax() - readyState (success)", function() {
-	expect( 1 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	var control = "";
-
-	setTimeout(function(){
-		jQuery.ajax({
-			url: url("data/name.html"),
-			beforeSend: function( xhr ) {
-				xhr.onreadystatechange = function() {
-					control += xhr.readyState;
-				}
-			},
-			complete: function(){
-				setTimeout( function() {
-					equals( control , "1234" , "onreadystatechange was properly called" );
-				}, 13 );
-				start();
-			}
-		});
-	}, 13);
-});
-
-test("jQuery.ajax() - readyState (abort)", function() {
-	expect( 2 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	var control = "";
-
-	setTimeout(function(){
-
-		jQuery.ajaxSetup({ timeout: 500 });
-
-		jQuery.ajax({
-			url: url("data/name.php?wait=5"),
-			beforeSend: function( xhr ) {
-				xhr.onreadystatechange = function() {
-					control += xhr.readyState;
-				}
-			},
-			complete: function( xhr ){
-				setTimeout( function() {
-					equals( control , "14" , "onreadystatechange was properly called" );
-					equals( xhr.readyState, 0 , "readyState is 0" );
-				}, 13 );
-				start();
-			}
-		});
-	}, 13);
-});
-
-test("jQuery.xhr() - reuse", function() {
-	expect( 15 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	var number = 0;
-
-	setTimeout(function(){
-		jQuery('#foo').ajaxStart(function(){
-			ok( true, "ajaxStart" );
-		}).ajaxStop(function(){
-			ok( true, "ajaxStop" );
-			start();
-		}).ajaxSend(function(){
-			number++;
-			ok( true, "ajaxSend (" + number +")" );
-		}).ajaxComplete(function(){
-			ok( true, "ajaxComplete (" + number +")" );
-		}).ajaxError(function(){
-			ok( false, "ajaxError (" + number +")" );
-		}).ajaxSuccess(function(){
-			ok( true, "ajaxSuccess (" + number +")" );
-		});
-
-		jQuery.ajax({
-			url: url("data/name.html"),
-			beforeSend: function(){ ok(true, "beforeSend (1)"); },
-			success: function( _1 , _2 , xhr ){
-				ok(true, "success (1)");
-				xhr.complete(function() {
-					ok(true, "complete (1bis)");
-				});
-				xhr.open( "GET", url("data/name.html") );
-				xhr.success( function(){ ok(true, "beforeSend (2)"); } )
-				xhr.send( null, {
-					success: function(){ ok(true, "success (2)"); },
-					error: function(){ ok(false, "error (2)"); },
-					complete: function(){ ok(true, "complete (2)"); }
-				} );
-			},
-			error: function(){ ok(false, "error (1)"); },
-			complete: function(){ ok(true, "complete (1)"); }
-		});
-	}, 13);
-});
-
-test("jQuery.xhr() - early binding", function() {
-	expect( 2 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	jQuery.xhr()
-		.success( function(){ ok(true, "success"); } )
-		.error( function(){ ok(false, "error"); } )
-		.complete( function(){ ok(true, "complete"); start(); } )
-		.open( "GET", url("data/name.html") )
-		.send();
-});
-
-test("jQuery.xhr() - get native implementation", function() {
-
-	var xhr = jQuery.xhr(true);
-
-	ok( xhr.readyState !== undefined , "implements XMLHttpRequest" );
-	ok( ! jQuery.isFunction( xhr.success ) , "is not jQuery's abstraction" );
-
-});
-
 test("Ajax events with context", function() {
 	expect(14);
 
@@ -653,34 +523,6 @@ test("jQuery.ajax() - disabled globals", function() {
 	});
 });
 
-test("jQuery.xhr() - disabled globals through xhr.send(data , false)", function() {
-	expect( 2 );
-	stop();
-
-	jQuery('#foo').ajaxStart(function(){
-		ok( false, "ajaxStart" );
-	}).ajaxStop(function(){
-		ok( false, "ajaxStop" );
-	}).ajaxSend(function(){
-		ok( false, "ajaxSend" );
-	}).ajaxComplete(function(){
-		ok( false, "ajaxComplete" );
-	}).ajaxError(function(){
-		ok( false, "ajaxError" );
-	}).ajaxSuccess(function(){
-		ok( false, "ajaxSuccess" );
-	});
-
-	jQuery.xhr()
-		.success(function(){ ok(true, "success"); })
-		.error(function(){ ok(false, "error"); })
-		.complete(function(){
-		  ok(true, "complete");
-		  setTimeout(function(){ start(); }, 13);
-		})
-		.open("GET", url("data/name.html")).send(undefined, false);
-});
-
 test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", function() {
 	expect(3);
 	stop();

From 2a5c16f217416a7cb5afce72a0f25c66d074fc0c Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 23:00:25 +0100
Subject: [PATCH 066/110] Revised logic in data conversion to account for when
 dataFilter modifies the dataTypes list.

---
 src/ajax.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 347273d15..7c0e1018d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -415,6 +415,8 @@ jQuery.extend({
 							
 							if ( i ) {
 								
+								prev = dataTypes[ i - 1 ];
+								
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
 									oneConv = conv1 = 
@@ -440,8 +442,6 @@ jQuery.extend({
 								response = s.dataFilter( response );
 								dataTypes = s.dataTypes;
 							}
-							
-							prev = current;
 						}
 		
 						// We have a real success

From 6165cc45b7f673aa0d9daf33659a2783f68a45ac Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 02:30:51 +0100
Subject: [PATCH 067/110] Renamed several ajaxSettings options. Removed cors
 test, fixed failing cors test.

---
 src/ajax.js              | 22 +++++++-------
 src/transports/jsonp.js  |  2 +-
 src/transports/script.js |  4 +--
 test/unit/ajax.js        | 64 ++++++++++------------------------------
 4 files changed, 30 insertions(+), 62 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 7c0e1018d..19ec83679 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -183,7 +183,7 @@ jQuery.extend({
 			"*": "*/*"
 		},
 
-		autoDataType: {
+		contents: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
@@ -208,7 +208,7 @@ jQuery.extend({
 		// List of data converters
 		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
-		dataConverters: {
+		converters: {
 
 			// Convert anything to text
 			"* text": window.String,
@@ -398,7 +398,7 @@ jQuery.extend({
 							oneConv,
 							convertion,
 							dataTypes = s.dataTypes,
-							dataConverters = s.dataConverters,
+							converters = s.converters,
 							responses = {
 								"xml": "XML",
 								"text": "Text"
@@ -420,14 +420,14 @@ jQuery.extend({
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
 									oneConv = conv1 = 
-										dataConverters[ ( conversion = prev + " " + current ) ] ||
-										dataConverters[ "* " + current ];
+										converters[ ( conversion = prev + " " + current ) ] ||
+										converters[ "* " + current ];
 									
 									if ( oneConv !== true ) {
 										
 										if ( ! oneConv && prev !== "text" && current !== "text" ) {
-											conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-											conv2 = dataConverters[ "text " + current ];
+											conv1 = converters[ prev + " text" ] || converters[ "* text" ];
+											conv2 = converters[ "text " + current ];
 										}
 										
 										if ( oneConv || conv1 && conv2 ) {
@@ -841,7 +841,7 @@ jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
 // (for those transports that can give text or xml responses)
 function determineDataType( s , ct , text , xml ) {
 	
-	var autoDataType = s.autoDataType,
+	var contents = s.contents,
 		type,
 		regexp,
 		dataTypes = s.dataTypes,
@@ -851,8 +851,8 @@ function determineDataType( s , ct , text , xml ) {
 	// Auto (xml, json, script or text determined given headers)
 	if ( transportDataType === "*" ) {
 
-		for ( type in autoDataType ) {
-			if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
+		for ( type in contents ) {
+			if ( ( regexp = contents[ type ] ) && regexp.test( ct ) ) {
 				transportDataType = dataTypes[0] = type;
 				break;
 			}
@@ -871,7 +871,7 @@ function determineDataType( s , ct , text , xml ) {
 		
 		response = text;
 		
-		// If it's not really text, defer to dataConverters
+		// If it's not really text, defer to converters
 		if ( transportDataType !== "text" ) {
 			dataTypes.unshift( "text" );
 		}
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index f16b394ba..aa30b5dda 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -70,7 +70,7 @@ jQuery.ajax.prefilter("json jsonp", function(s) {
 		}, s.complete ];
 				
 		// Use data converter to retrieve json after script execution
-		s.dataConverters["script json"] = function() {
+		s.converters["script json"] = function() {
 			if ( ! responseContainer ) {
 				jQuery.error( jsonpCallback + " was not called" );
 			}
diff --git a/src/transports/script.js b/src/transports/script.js
index ddfaf3682..d18f4d76e 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -7,11 +7,11 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 		script: "text/javascript, application/javascript"
 	},
 	
-	autoDataType: {
+	contents: {
 		script: /javascript/
 	},
 		
-	dataConverters: {
+	converters: {
 		"text script": jQuery.globalEval
 	}
 } );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 1a1ec3321..4019eb71b 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -70,44 +70,6 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
 	}, 13);
 });
 
-test("jQuery.ajax() - success/error callbacks (remote)", function() {
-
-	var supports = jQuery.support.cors;
-	
-	expect( supports ? 9 : 4 );
-
-	jQuery.ajaxSetup({ timeout: 0 });
-
-	stop();
-
-	setTimeout(function(){
-		jQuery('#foo').ajaxStart(function(){
-			ok( true, "ajaxStart" );
-		}).ajaxStop(function(){
-			ok( true, "ajaxStop" );
-			start();
-		}).ajaxSend(function(){
-			ok( supports , "ajaxSend" );
-		}).ajaxComplete(function(){
-			ok( true, "ajaxComplete" );
-		}).ajaxError(function(){
-			ok( ! supports, "ajaxError" );
-		}).ajaxSuccess(function(){
-			ok( supports, "ajaxSuccess" );
-		});
-
-		jQuery.ajax({
-			// JULIAN TODO:	Get an url especially for jQuery
-			url: "http://rockstarapps.com/test.php",
-			dataType: "text",
-			beforeSend: function(){ ok(supports, "beforeSend"); },
-			success: function( val ){ ok(supports, "success"); ok(supports && val.length, "data received"); },
-			error: function(_ , a , b ){ ok(false, "error"); },
-			complete: function(){ ok(supports, "complete"); }
-		});
-	}, 13);
-});
-
 test("jQuery.ajax() - success callbacks (late binding)", function() {
 	expect( 8 );
 
@@ -1328,12 +1290,12 @@ test("jQuery.ajax() - json by content-type disabled with options", function() {
 	jQuery.ajax({
 		url: url("data/json.php"),
 		data: { header: "json", json: "array" },
-		autoDataType: {
+		contents: {
 			json: false
 		},
 		success: function( text ) {
 			equals( typeof text , "string" , "json wasn't auto-determined" );
-			var json = this.dataConverters["text json"]( text );
+			var json = jQuery.parseJSON( text );
 	  		ok( json.length >= 2, "Check length");
 	  		equals( json[0].name, 'John', 'Check JSON: first, name' );
 	  		equals( json[0].age, 21, 'Check JSON: first, age' );
@@ -1676,21 +1638,27 @@ test("jQuery ajax - failing cross-domain", function() {
 	stop();
 
 	var i = 2;
-
-	jQuery.ajax({
-		url: 'http://somewebsitethatdoesnotexist.com',
+	
+	if ( jQuery.ajax({
+		url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	});
-
-	jQuery.ajax({
+	}) === false ) {
+		ok( true , "no transport" );
+		if ( ! --i ) start();
+	}
+	
+	if ( jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	});
-
+	}) === false ) {
+		ok( true , "no transport" );
+		if ( ! --i ) start();
+	}
+	
 });
 
 test("jQuery ajax - atom+xml", function() {

From 6dbffb8596a9c96c68386ecc2d95da25b9dee369 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 04:13:44 +0100
Subject: [PATCH 068/110] Introduced a new promise method on deferreds that
 returns an immutable object (exposing then, fail, isResolved, isRejected and
 promise itself only). Remove $.isDeferred and moved logic directly into
 $.when. Made sure $.when returns a promise by using promise(). Used promise()
 in ajax code too.

---
 src/ajax.js       |  7 +++---
 src/core.js       | 30 ++++++++++++------------
 test/unit/core.js | 58 ++++++++++++++++++++++-------------------------
 3 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 19ec83679..0fca962aa 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -489,9 +489,10 @@ jQuery.extend({
 			}
 		}
 		
-		// Attach deferreds	
-		jXHR.success = jXHR.then = deferred.then;
-		jXHR.error = jXHR.fail = deferred.fail;
+		// Attach deferreds
+		deferred.promise( jXHR );
+		jXHR.success = jXHR.then;
+		jXHR.error = jXHR.fail;
 		jXHR.complete = completeDeferred.then;
 
 		// Remove hash character (#7531: and string promotion)
diff --git a/src/core.js b/src/core.js
index 67429f779..3bbdce3c6 100644
--- a/src/core.js
+++ b/src/core.js
@@ -78,7 +78,7 @@ var jQuery = function( selector, context ) {
 	class2type = {},
 	
 	// Marker for deferred
-	deferredMarker = [];
+	promiseMarker = [];
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -896,9 +896,6 @@ jQuery.extend({
 				}
 			};
 		
-		// Add the deferred marker
-		deferred.then._ = deferredMarker;
-		
 		return deferred;
 	},
 	
@@ -916,7 +913,16 @@ jQuery.extend({
 				fail: errorDeferred.then,
 				fireReject: errorDeferred.fire,
 				reject: errorDeferred.resolve,
-				isRejected: errorDeferred.isResolved
+				isRejected: errorDeferred.isResolved,
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					obj = obj || {};
+					for ( var i in { then:1 , fail:1 , isResolved:1 , isRejected:1 , promise:1 } ) {
+						obj[ i ] = deferred[ i ];
+					}
+					return obj;
+				}
 
 		} );
 		
@@ -924,6 +930,9 @@ jQuery.extend({
 		delete deferred.cancel;
 		delete deferred.isCancelled;
 		
+		// Add promise marker
+		deferred.promise._ = promiseMarker;
+		
 		// Make sure only one callback list will be used
 		deferred.then( errorDeferred.cancel ).fail( successCancel );
 		
@@ -935,17 +944,12 @@ jQuery.extend({
 		return deferred;
 	},
 
-	// Check if an object is a deferred
-	isDeferred: function( object ) {
-		return !!( object && object.then && object.then._ === deferredMarker );
-	},
-	
 	// Deferred helper
 	when: function( object ) {
-		object = jQuery.isDeferred( object ) ?
+		object = object && object.promise && object.promise._ === promiseMarker ?
 			object :
 			jQuery.Deferred().resolve( object );
-		return object;
+		return object.promise();
 	},
 
 	// Use of jQuery.browser is frowned upon.
@@ -966,9 +970,7 @@ jQuery.extend({
 });
 
 // Create readyList deferred
-// also force $.fn.ready to be recognized as a defer
 readyList = jQuery._Deferred();
-jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map
 jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
diff --git a/test/unit/core.js b/test/unit/core.js
index e0938b68a..1cd41a675 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1022,42 +1022,38 @@ test("jQuery.Deferred()", function() {
 	});
 });
 	
-test("jQuery.isDeferred()", function() {
-	
-	expect( 10 );
-	
-	var object1 = { then: function() { return this; } },
-		object2 = { then: function() { return this; } };
-		
-	object2.then._ = [];
-	
-	// The use case that we want to match
-	ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
-	ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");
-	
-	// Some other objects
-	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
-	ok(!jQuery.isDeferred(object2), "Object with then & marker");
-	
-	// Not objects shouldn't be matched
-	ok(!jQuery.isDeferred(""), "string");
-	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
-	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
-	ok(!jQuery.isDeferred(null), "null");
-	ok(!jQuery.isDeferred(undefined), "undefined");
-	
-	object1 = {custom: jQuery._Deferred().then};
-	
-	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
-});
-
 test("jQuery.when()", function() {
 	
-	expect( 2 );
+	expect( 14 );
+	
+	var fakeDeferred = { then: function() { return this; } };
+		
+	fakeDeferred.then._ = [];
+	
+	// Some other objects
+	jQuery.each( {
+		
+		"Object with then & no marker": { then: jQuery.noop },
+		"Object with then & marker": fakeDeferred,
+		"string 1/2": "",
+		"string 2/2": "some string",
+		"number 1/2": 0,
+		"number 2/2": 1,
+		"boolean 1/2": true,
+		"boolean 2/2": false,
+		"null": null,
+		"undefined": undefined,
+		"custom method name not found automagically": {custom: jQuery._Deferred().then}
+	
+	} , function( message , value ) {
+		
+		notStrictEqual( jQuery.when( value ) , value , message );
+		
+	} );
 	
 	var cache, i;
 	
-	for( i = 1 ; i < 3 ; i++ ) {
+	for( i = 1 ; i < 4 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );
 		}) ).then( function( value ) {

From 3c6f1380fa67542ff8c67d6363a865ae3ec23516 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 29 Dec 2010 18:44:45 +0100
Subject: [PATCH 069/110] Revised conversion logic to handle converter equal to
 true properly.

---
 src/ajax.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 0fca962aa..5e58a0fa0 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -393,9 +393,9 @@ jQuery.extend({
 							current,
 							prev,
 							checker,
+							conv,
 							conv1,
 							conv2,
-							oneConv,
 							convertion,
 							dataTypes = s.dataTypes,
 							converters = s.converters,
@@ -419,23 +419,28 @@ jQuery.extend({
 								
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 								
-									oneConv = conv1 = 
-										converters[ ( conversion = prev + " " + current ) ] ||
+									conv = converters[ ( conversion = prev + " " + current ) ] ||
 										converters[ "* " + current ];
 									
-									if ( oneConv !== true ) {
-										
-										if ( ! oneConv && prev !== "text" && current !== "text" ) {
-											conv1 = converters[ prev + " text" ] || converters[ "* text" ];
-											conv2 = converters[ "text " + current ];
-										}
-										
-										if ( oneConv || conv1 && conv2 ) {
-											response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-										} else {
-											throw "no " + conversion;
+									conv1 = conv2 = 0;
+									
+									if ( ! conv && prev !== "text" && current !== "text" ) {
+										conv1 = converters[ prev + " text" ] || converters[ "* text" ];
+										conv2 = converters[ "text " + current ];
+										if ( conv1 === true ) {
+											conv = conv2;
+										} else if ( conv2 === true ) {
+											conv = conv1;
 										}
 									}
+									
+									if ( ! ( conv || conv1 && conv2 ) ) {
+										throw conversion;
+									}
+									
+									if ( conv !== true ) {
+										response = conv ? conv( response ) : conv2( conv1( response ) );
+									}
 								}
 							} else if ( s.dataFilter ) {
 								

From 6fb9759a75bf2b9a2aa3a8fce9cd7afc011d8c4f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 30 Dec 2010 17:06:53 +0100
Subject: [PATCH 070/110] Simplified the way a Promise is tested for (removed
 promiseMarker). Removed isCancelled helper method from _Deferred, wasn't used
 nor tested. Reworked jQuery.Deferred and removed unnecessary variables. Also
 ensured a Promise will return itself when asked for a Promise. Finally, the
 jQuery.when tests have been revamped.

---
 src/core.js       | 48 +++++++++++++++++++----------------------------
 test/unit/core.js | 26 +++++++++++--------------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/src/core.js b/src/core.js
index 3bbdce3c6..0211808c5 100644
--- a/src/core.js
+++ b/src/core.js
@@ -75,10 +75,7 @@ var jQuery = function( selector, context ) {
 	indexOf = Array.prototype.indexOf,
 
 	// [[Class]] -> type pairs
-	class2type = {},
-	
-	// Marker for deferred
-	promiseMarker = [];
+	class2type = {};
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -874,7 +871,7 @@ jQuery.extend({
 				
 				// resolve with this as context and given arguments
 				resolve: function() {
-					deferred.fire( this , arguments );
+					deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
 					return this;
 				},
 				
@@ -888,11 +885,6 @@ jQuery.extend({
 					cancelled = 1;
 					callbacks = [];
 					return this;
-				},
-				
-				// Has this deferred been cancelled?
-				isCancelled: function() {
-					return !!cancelled;
 				}
 			};
 		
@@ -903,38 +895,36 @@ jQuery.extend({
 	// Typical success/error system
 	Deferred: function( func ) {
 		
-		var errorDeferred = jQuery._Deferred(),
-			deferred = jQuery._Deferred(),
-			successCancel = deferred.cancel;
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred();
 			
 		// Add errorDeferred methods and redefine cancel			
 		jQuery.extend( deferred , {
 
-				fail: errorDeferred.then,
-				fireReject: errorDeferred.fire,
-				reject: errorDeferred.resolve,
-				isRejected: errorDeferred.isResolved,
+				fail: failDeferred.then,
+				fireReject: failDeferred.fire,
+				reject: failDeferred.resolve,
+				isRejected: failDeferred.isResolved,
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
 				promise: function( obj ) {
 					obj = obj || {};
-					for ( var i in { then:1 , fail:1 , isResolved:1 , isRejected:1 , promise:1 } ) {
-						obj[ i ] = deferred[ i ];
-					}
+					jQuery.each( "then fail isResolved isRejected".split( " " ) , function( _ , method ) {
+						obj[ method ] = deferred[ method ];
+					});
+					obj.promise = function() {
+						return obj;
+					};
 					return obj;
 				}
 
 		} );
 		
-		// Remove cancel related
-		delete deferred.cancel;
-		delete deferred.isCancelled;
-		
-		// Add promise marker
-		deferred.promise._ = promiseMarker;
-		
 		// Make sure only one callback list will be used
-		deferred.then( errorDeferred.cancel ).fail( successCancel );
+		deferred.then( failDeferred.cancel ).fail( deferred.cancel );
+		
+		// Unexpose cancel
+		delete deferred.cancel;
 		
 		// Call given func if any
 		if ( func ) {
@@ -946,7 +936,7 @@ jQuery.extend({
 
 	// Deferred helper
 	when: function( object ) {
-		object = object && object.promise && object.promise._ === promiseMarker ?
+		object = object && jQuery.isFunction( object.promise ) ?
 			object :
 			jQuery.Deferred().resolve( object );
 		return object.promise();
diff --git a/test/unit/core.js b/test/unit/core.js
index 1cd41a675..9367ab10d 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1024,30 +1024,26 @@ test("jQuery.Deferred()", function() {
 	
 test("jQuery.when()", function() {
 	
-	expect( 14 );
-	
-	var fakeDeferred = { then: function() { return this; } };
-		
-	fakeDeferred.then._ = [];
+	expect( 21 );
 	
 	// Some other objects
 	jQuery.each( {
 		
-		"Object with then & no marker": { then: jQuery.noop },
-		"Object with then & marker": fakeDeferred,
-		"string 1/2": "",
-		"string 2/2": "some string",
-		"number 1/2": 0,
-		"number 2/2": 1,
-		"boolean 1/2": true,
-		"boolean 2/2": false,
+		"an empty string": "",
+		"a non-empty string": "some string",
+		"zero": 0,
+		"a number other than zero": 1,
+		"true": true,
+		"false": false,
 		"null": null,
 		"undefined": undefined,
-		"custom method name not found automagically": {custom: jQuery._Deferred().then}
+		"a plain object": {}
 	
 	} , function( message , value ) {
 		
-		notStrictEqual( jQuery.when( value ) , value , message );
+		ok( jQuery.isFunction( jQuery.when( value ).then( function( resolveValue ) {
+			strictEqual( resolveValue , value , "Test the promise was resolved with " + message );
+		} ).promise ) , "Test " + message + " triggers the creation of a new Promise" );
 		
 	} );
 	

From eed3803c98bf5c074e40aad12f2e91435bf81154 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Fri, 31 Dec 2010 13:56:51 -0600
Subject: [PATCH 071/110] When serializing text, encode all line breaks as CRLF
 pairs per the application/x-www-form-urlencoded specification. Fixes #6876.

---
 src/ajax.js       | 4 ++--
 test/unit/ajax.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 5e58a0fa0..86709005e 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -107,9 +107,9 @@ jQuery.fn.extend({
 				null :
 				jQuery.isArray(val) ?
 					jQuery.map( val, function(val, i){
-						return {name: elem.name, value: val};
+						return {name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
 					}) :
-					{name: elem.name, value: val};
+					{name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
 		}).get();
 	}
 });
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4019eb71b..270d32f8b 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -650,20 +650,20 @@ test("serialize()", function() {
 		'Check input serialization as query string');
 
 	equals( jQuery('#testForm').serialize(),
-		'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
+		'T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
 		'Check form serialization as query string');
 
 	equals( jQuery('#testForm :input').serialize(),
-		'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
+		'T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
 		'Check input serialization as query string');
 
 	equals( jQuery('#form, #testForm').serialize(),
-		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3&T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
 		'Multiple form serialization as query string');
 
   /* Temporarily disabled. Opera 10 has problems with form serialization.
 	equals( jQuery('#form, #testForm :input').serialize(),
-		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
 		'Mixed form/input serialization as query string');
 	*/
 	jQuery("#html5email, #html5number").remove();

From 4ab94a578ee7760c4e44bafa56139af82c40028b Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Tue, 4 Jan 2011 06:52:26 -0800
Subject: [PATCH 072/110] Updating year to 2011.

---
 MIT-LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index ea336914d..532704636 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010 John Resig, http://jquery.com/
+Copyright (c) 2011 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From cbf591152c9f61381e552c9a15bb7c339f1451a9 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 5 Jan 2011 04:29:30 +0100
Subject: [PATCH 073/110] "then" renamed "complete" and new "then" method
 defined using "complete" and "fail" internally. The API is still symetrical
 (complete/fail), still promotes AOP but is also now Promise/A compliant.
 Changed unit tests and ajax module accordingly.

---
 src/ajax.js       |  4 ++--
 src/core.js       | 44 ++++++++++++++++++++++++--------------------
 test/unit/core.js | 28 ++++++++++++++--------------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 86709005e..32f75f6eb 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -496,9 +496,9 @@ jQuery.extend({
 		
 		// Attach deferreds
 		deferred.promise( jXHR );
-		jXHR.success = jXHR.then;
+		jXHR.success = jXHR.complete;
 		jXHR.error = jXHR.fail;
-		jXHR.complete = completeDeferred.then;
+		jXHR.complete = completeDeferred.complete;
 
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
diff --git a/src/core.js b/src/core.js
index 0211808c5..edd2c94d8 100644
--- a/src/core.js
+++ b/src/core.js
@@ -258,7 +258,7 @@ jQuery.fn = jQuery.prototype = {
 		jQuery.bindReady();
 		
 		// Change ready & apply
-		return ( jQuery.fn.ready = readyList.then ).apply( this , arguments );
+		return ( jQuery.fn.ready = readyList.complete ).apply( this , arguments );
 	},
 
 	eq: function( i ) {
@@ -815,8 +815,8 @@ jQuery.extend({
 			// the deferred itself
 			deferred  = {
 				
-				// then( f1, f2, ...)
-				then: function () {
+				// complete( f1, f2, ...)
+				complete: function () {
 					
 					if ( ! cancelled ) {
 						
@@ -836,7 +836,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								deferred.then.apply( deferred , elem );
+								deferred.complete.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}
@@ -901,27 +901,31 @@ jQuery.extend({
 		// Add errorDeferred methods and redefine cancel			
 		jQuery.extend( deferred , {
 
-				fail: failDeferred.then,
-				fireReject: failDeferred.fire,
-				reject: failDeferred.resolve,
-				isRejected: failDeferred.isResolved,
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					obj = obj || {};
-					jQuery.each( "then fail isResolved isRejected".split( " " ) , function( _ , method ) {
-						obj[ method ] = deferred[ method ];
-					});
-					obj.promise = function() {
-						return obj;
-					};
+		    then: function( completeCallbacks , failCallbacks ) {
+		    	deferred.complete( completeCallbacks ).fail( failCallbacks );
+		    	return this;
+		    },
+			fail: failDeferred.complete,
+			fireReject: failDeferred.fire,
+			reject: failDeferred.resolve,
+			isRejected: failDeferred.isResolved,
+			// Get a promise for this deferred
+			// If obj is provided, the promise aspect is added to the object
+			promise: function( obj ) {
+				obj = obj || {};
+				jQuery.each( "then complete fail isResolved isRejected".split( " " ) , function( _ , method ) {
+					obj[ method ] = deferred[ method ];
+				});
+				obj.promise = function() {
 					return obj;
-				}
+				};
+				return obj;
+			}
 
 		} );
 		
 		// Make sure only one callback list will be used
-		deferred.then( failDeferred.cancel ).fail( deferred.cancel );
+		deferred.then( failDeferred.cancel , deferred.cancel );
 		
 		// Unexpose cancel
 		delete deferred.cancel;
diff --git a/test/unit/core.js b/test/unit/core.js
index 9367ab10d..1fc2a4ac6 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -917,7 +917,7 @@ test("jQuery._Deferred()", function() {
 		
 	test = false;
 		
-	deferred.then( function( value ) {
+	deferred.complete( function( value ) {
 		equals( value , "value" , "Test pre-resolve callback" );
 		test = true;
 	} );
@@ -928,7 +928,7 @@ test("jQuery._Deferred()", function() {
 
 	test = false;
 	
-	deferred.then( function( value ) {
+	deferred.complete( function( value ) {
 		equals( value , "value" , "Test post-resolve callback" );
 		test = true;
 	} );
@@ -939,7 +939,7 @@ test("jQuery._Deferred()", function() {
 	
 	test = true;
 	
-	deferred.then( function() {
+	deferred.complete( function() {
 		ok( false , "Cancel was ignored" );
 		test = false;
 	} );
@@ -949,18 +949,18 @@ test("jQuery._Deferred()", function() {
 	deferred = jQuery._Deferred().resolve();
 	
 	try {
-		deferred.then( function() {
+		deferred.complete( function() {
 			throw "Error";
 		} , function() {
 			ok( true , "Test deferred do not cancel on exception" );
 		} );
 	} catch( e ) {
 		strictEqual( e , "Error" , "Test deferred propagates exceptions");
-		deferred.then();
+		deferred.complete();
 	}
 	
 	test = "";
-	deferred = jQuery._Deferred().then( function() {
+	deferred = jQuery._Deferred().complete( function() {
 		
 		test += "A";
 		
@@ -970,13 +970,13 @@ test("jQuery._Deferred()", function() {
 		
 	} ).resolve();
 	
-	strictEqual( test , "AB" , "Test multiple then parameters" );
+	strictEqual( test , "AB" , "Test multiple complete parameters" );
 	
 	test = "";
 	
-	deferred.then( function() {
+	deferred.complete( function() {
 		
-		deferred.then( function() {
+		deferred.complete( function() {
 			
 			test += "C";
 			
@@ -989,11 +989,11 @@ test("jQuery._Deferred()", function() {
 		test += "B";
 	} );
 	
-	strictEqual( test , "ABC" , "Test then callbacks order" );
+	strictEqual( test , "ABC" , "Test complete callbacks order" );
 	
 	deferred = jQuery._Deferred();
 	
-	deferred.fire( jQuery , [ document ] ).then( function( doc ) {
+	deferred.fire( jQuery , [ document ] ).complete( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });
@@ -1011,13 +1011,13 @@ test("jQuery.Deferred()", function() {
 	
 	jQuery.Deferred().resolve().then( function() {
 		ok( true , "Success on resolve" );
-	}).fail( function() {
+	}, function() {
 		ok( false , "Error on resolve" );
 	});
 	
 	jQuery.Deferred().reject().then( function() {
 		ok( false , "Success on reject" );
-	}).fail( function() {
+	}, function() {
 		ok( true , "Error on reject" );
 	});
 });
@@ -1055,7 +1055,7 @@ test("jQuery.when()", function() {
 		}) ).then( function( value ) {
 			strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );
 			cache = value;
-		}).fail( function() {
+		}, function() {
 			ok( false , "Fail called" );
 		});
 	}

From ae6655bcb6d852b79df2ddc5545832c5d08936f4 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 5 Jan 2011 13:26:05 -0800
Subject: [PATCH 074/110] Revert "Register as a CommonJS async module if in
 that kind of environment. Fixes #7102."

This reverts commit 6ffa730721a8ebcd128f3dc202706e46d9cfe249.

Conflicts:

	src/core.js
---
 src/core.js           |  5 -----
 test/data/testinit.js |  7 +------
 test/unit/core.js     | 46 +++++++++++++++++++++----------------------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/core.js b/src/core.js
index edd2c94d8..59a89d2d2 100644
--- a/src/core.js
+++ b/src/core.js
@@ -1034,11 +1034,6 @@ function doScrollCheck() {
 	jQuery.ready();
 }
 
-// Expose jQuery as an Asynchronous Module
-if ( typeof define === "function" ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
 // Expose jQuery to the global object
 return (window.jQuery = window.$ = jQuery);
 
diff --git a/test/data/testinit.js b/test/data/testinit.js
index 8f431fb5e..a66f71d25 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -1,12 +1,7 @@
 var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
 	$ = this.$ || "$",
 	originaljQuery = jQuery,
-	original$ = $,
-	commonJSDefined;
-
-function define(module, dependencies, callback) {
-	commonJSDefined = callback();
-}
+	original$ = $;
 
 /**
  * Returns an array of elements with the given IDs, eg.
diff --git a/test/unit/core.js b/test/unit/core.js
index 1fc2a4ac6..1baf6c231 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,9 +12,7 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(24);
-
-	strictEqual( commonJSDefined, jQuery, "CommonJS registered (Bug #7102)" );
+	expect(23);
 
 	// Basic constructor's behavior
 
@@ -153,7 +151,7 @@ test("selector state", function() {
 	test = jQuery("#main").eq(0);
 	equals( test.selector, "#main.slice(0,1)", "#main eq Selector" );
 	equals( test.context, document, "#main eq Context" );
-
+	
 	var d = "<div />";
 	equals(
 		jQuery(d).appendTo(jQuery(d)).selector,
@@ -255,38 +253,38 @@ test("isPlainObject", function() {
 
 	// The use case that we want to match
 	ok(jQuery.isPlainObject({}), "{}");
-
+	
 	// Not objects shouldn't be matched
 	ok(!jQuery.isPlainObject(""), "string");
 	ok(!jQuery.isPlainObject(0) && !jQuery.isPlainObject(1), "number");
 	ok(!jQuery.isPlainObject(true) && !jQuery.isPlainObject(false), "boolean");
 	ok(!jQuery.isPlainObject(null), "null");
 	ok(!jQuery.isPlainObject(undefined), "undefined");
-
+	
 	// Arrays shouldn't be matched
 	ok(!jQuery.isPlainObject([]), "array");
-
+ 
 	// Instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new Date), "new Date");
-
+ 
 	var fn = function(){};
-
+ 
 	// Functions shouldn't be matched
 	ok(!jQuery.isPlainObject(fn), "fn");
-
+ 
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn (no methods)");
-
+ 
 	// Makes the function a little more realistic
 	// (and harder to detect, incidentally)
 	fn.prototype = {someMethod: function(){}};
-
+ 
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn");
 
 	// DOM Element
 	ok(!jQuery.isPlainObject(document.createElement("div")), "DOM Element");
-
+	
 	// Window
 	ok(!jQuery.isPlainObject(window), "window");
 
@@ -300,7 +298,7 @@ test("isPlainObject", function() {
 			document.body.removeChild( iframe );
 			start();
 		};
-
+ 
 		var doc = iframe.contentDocument || iframe.contentWindow.document;
 		doc.open();
 		doc.write("<body onload='window.parent.iframeDone(Object);'>");
@@ -661,7 +659,7 @@ test("jQuery.merge()", function() {
 
 	// Fixed at [5998], #3641
 	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
-
+	
 	// After fixing #5527
 	same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values");
 	same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like");
@@ -696,7 +694,7 @@ test("jQuery.extend(Object, Object)", function() {
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
 	ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" );
-
+	
 	// #5991
 	ok( jQuery.isArray( jQuery.extend(true, { arr: {} }, nestedarray).arr ), "Cloned array heve to be an Array" );
 	ok( jQuery.isPlainObject( jQuery.extend(true, { arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
@@ -717,13 +715,13 @@ test("jQuery.extend(Object, Object)", function() {
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
-
+	
 	// Makes the class a little more realistic
 	myKlass.prototype = { someMethod: function(){} };
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" );
-
+	
 	var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
 	ok( ret.foo == 5, "Wrapped numbers copy correctly" );
 
@@ -851,10 +849,10 @@ test("jQuery.makeArray", function(){
 
 test("jQuery.isEmptyObject", function(){
 	expect(2);
-
+	
 	equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
 	equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );
-
+	
 	// What about this ?
 	// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
 });
@@ -880,23 +878,23 @@ test("jQuery.proxy", function(){
 
 test("jQuery.parseJSON", function(){
 	expect(8);
-
+	
 	equals( jQuery.parseJSON(), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( null ), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." );
-
+	
 	same( jQuery.parseJSON("{}"), {}, "Plain object parsing." );
 	same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." );
 
 	same( jQuery.parseJSON('\n{"test":1}'), {"test":1}, "Make sure leading whitespaces are handled." );
-
+	
 	try {
 		jQuery.parseJSON("{a:1}");
 		ok( false, "Test malformed JSON string." );
 	} catch( e ) {
 		ok( true, "Test malformed JSON string." );
 	}
-
+	
 	try {
 		jQuery.parseJSON("{'a':1}");
 		ok( false, "Test malformed JSON string." );

From e56de77df90e50b9999a02e57241b1cf498b0fe4 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Wed, 5 Jan 2011 15:41:23 -0600
Subject: [PATCH 075/110] Cleaning up trailing whitespace again.

---
 src/ajax.js              | 244 +++++++++++++++++++--------------------
 src/core.js              |  64 +++++-----
 src/transports/jsonp.js  |  26 ++---
 src/transports/script.js |  32 ++---
 src/transports/xhr.js    |  86 +++++++-------
 test/unit/ajax.js        |   6 +-
 test/unit/core.js        | 132 ++++++++++-----------
 7 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 32f75f6eb..d78542d02 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,5 +1,5 @@
 (function( jQuery ) {
-	
+
 var r20 = /%20/g,
 	rbracket = /\[\]$/,
 	rhash = /#.*$/,
@@ -14,7 +14,7 @@ var r20 = /%20/g,
 
 	// Slice function
 	sliceFunc = Array.prototype.slice,
-	
+
 	// Keep a copy of the old load method
 	_load = jQuery.fn.load;
 
@@ -227,26 +227,26 @@ jQuery.extend({
 	// Main method
 	// (s is used internally)
 	ajax: function( url , options , s ) {
-		
+
 		// Handle varargs
 		if ( arguments.length === 1 ) {
 			options = url;
 			url = options ? options.url : undefined;
 		}
-		
+
 		// Force options to be an object
 		options = options || {};
-		
+
 		// Get the url if provided separately
 		options.url = url || options.url;
-		
+
 		// Create the final options object
 		s = jQuery.extend( true , {} , jQuery.ajaxSettings , options );
-		
+
 		// We force the original context
 		// (plain objects used as context get extended)
 		s.context = options.context;
-		
+
 		var // jQuery lists
 			jQuery_lastModified = jQuery.lastModified,
 			jQuery_etag = jQuery.etag,
@@ -271,9 +271,9 @@ jQuery.extend({
 			i,
 			// Fake xhr
 			jXHR = {
-				
+
 				readyState: 0,
-				
+
 				// Caches the header
 				setRequestHeader: function(name,value) {
 					if ( state === 0 ) {
@@ -281,26 +281,26 @@ jQuery.extend({
 					}
 					return this;
 				},
-				
+
 				// Raw string
 				getAllResponseHeaders: function() {
 					return state === 2 ? responseHeadersString : null;
 				},
-				
+
 				// Builds headers hashtable if needed
 				// (match is used internally)
 				getResponseHeader: function( key , match ) {
-					
+
 					if ( state !== 2 ) {
 						return null;
 					}
-					
+
 					if ( responseHeaders === undefined ) {
-						
+
 						responseHeaders = {};
-						
+
 						if ( typeof responseHeadersString === "string" ) {
-							
+
 							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
 								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
 							}
@@ -308,7 +308,7 @@ jQuery.extend({
 					}
 					return responseHeaders[ key.toLowerCase() ];
 				},
-				
+
 				// Cancel the request
 				abort: function( statusText ) {
 					if ( transport && state !== 2 ) {
@@ -323,15 +323,15 @@ jQuery.extend({
 		// It is defined here because jslint complains if it is declared
 		// at the end of the function (which would be more logical and readable)
 		function done( status , statusText , response , headers) {
-			
+
 			// Called once
 			if ( state === 2 ) {
 				return;
 			}
-			
+
 			// State is "done" now
 			state = 2;
-			
+
 			// Set readyState
 			jXHR.readyState = status ? 4 : 0;
 
@@ -342,35 +342,35 @@ jQuery.extend({
 			if ( timeoutTimer ) {
 				clearTimeout(timeoutTimer);
 			}
-			
+
 			var // Reference url
 				url = s.url,
 				// and ifModified status
 				ifModified = s.ifModified,
-				
+
 				// Is it a success?
 				isSuccess = 0,
 				// Stored success
 				success,
 				// Stored error
 				error = statusText;
-			
+
 			// If not timeout, force a jQuery-compliant status text
 			if ( statusText != "timeout" ) {
-				statusText = ( status >= 200 && status < 300 ) ? 
+				statusText = ( status >= 200 && status < 300 ) ?
 					"success" :
 					( status === 304 ? "notmodified" : "error" );
 			}
-			
+
 			// If successful, handle type chaining
 			if ( statusText === "success" || statusText === "notmodified" ) {
-				
+
 				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 				if ( s.ifModified ) {
-					
+
 					var lastModified = jXHR.getResponseHeader("Last-Modified"),
 						etag = jXHR.getResponseHeader("Etag");
-						
+
 					if (lastModified) {
 						jQuery_lastModified[ s.url ] = lastModified;
 					}
@@ -378,17 +378,17 @@ jQuery.extend({
 						jQuery_etag[ s.url ] = etag;
 					}
 				}
-				
+
 				if ( s.ifModified && statusText === "notmodified" ) {
-					
+
 					success = null;
 					isSuccess = 1;
-					
+
 				} else {
 					// Chain data conversions and determine the final value
 					// (if an exception is thrown in the process, it'll be notified as an error)
 					try {
-						
+
 						var i,
 							current,
 							prev,
@@ -403,27 +403,27 @@ jQuery.extend({
 								"xml": "XML",
 								"text": "Text"
 							};
-						
+
 						for( i = 0 ; i < dataTypes.length ; i++ ) {
-							
+
 							current = dataTypes[ i ];
-							
+
 							if ( responses[ current ] ) {
 								jXHR[ "response" + responses[ current ] ] = response;
 								responses[ current ] = 0;
 							}
-							
+
 							if ( i ) {
-								
+
 								prev = dataTypes[ i - 1 ];
-								
+
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
-								
+
 									conv = converters[ ( conversion = prev + " " + current ) ] ||
 										converters[ "* " + current ];
-									
+
 									conv1 = conv2 = 0;
-									
+
 									if ( ! conv && prev !== "text" && current !== "text" ) {
 										conv1 = converters[ prev + " text" ] || converters[ "* text" ];
 										conv2 = converters[ "text " + current ];
@@ -433,58 +433,58 @@ jQuery.extend({
 											conv = conv1;
 										}
 									}
-									
+
 									if ( ! ( conv || conv1 && conv2 ) ) {
 										throw conversion;
 									}
-									
+
 									if ( conv !== true ) {
 										response = conv ? conv( response ) : conv2( conv1( response ) );
 									}
 								}
 							} else if ( s.dataFilter ) {
-								
+
 								response = s.dataFilter( response );
 								dataTypes = s.dataTypes;
 							}
 						}
-		
+
 						// We have a real success
 						success = response;
 						isSuccess = 1;
-						
+
 					} catch(e) {
-						
+
 						statusText = "parsererror";
 						error = "" + e;
-						
+
 					}
 				}
-				
+
 			} else { // if not success, mark it as an error
-				
+
 					error = error || statusText;
 			}
-				
+
 			// Set data for the fake xhr object
 			jXHR.status = status;
 			jXHR.statusText = statusText;
-			
+
 			// Success/Error
 			if ( isSuccess ) {
 				deferred.fire( callbackContext , [ success , statusText , jXHR ] );
 			} else {
 				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
 			}
-			
+
 			if ( s.global ) {
 				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
 						[ jXHR , s , isSuccess ? success : error ] );
 			}
-			
+
 			// Complete
 			completeDeferred.fire( callbackContext, [ jXHR , statusText ] );
-			
+
 			if ( s.global ) {
 				globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] );
 				// Handle the global AJAX counter
@@ -493,7 +493,7 @@ jQuery.extend({
 				}
 			}
 		}
-		
+
 		// Attach deferreds
 		deferred.promise( jXHR );
 		jXHR.success = jXHR.complete;
@@ -502,16 +502,16 @@ jQuery.extend({
 
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
-		
+
 		// Uppercase the type
 		s.type = s.type.toUpperCase();
-		
+
 		// Determine if request has content
 		s.hasContent = ! rnoContent.test( s.type );
-		
+
 		// Extract dataTypes list
 		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
-		
+
 		// Determine if a cross-domain request is in order
 		var parts = rurl.exec( s.url.toLowerCase() ),
 			loc = location;
@@ -526,93 +526,93 @@ jQuery.extend({
 		if ( s.global && jQuery.active++ === 0 ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
-		
+
 		// Get transport
 		transport = jQuery.ajax.prefilter( s ).transport( s );
-		
+
 		// If no transport, we auto-abort
 		if ( ! transport ) {
-			
+
 			done( 0 , "transport not found" );
 			jXHR = false;
-			
+
 		} else {
-			
+
 			// More options handling for requests with no content
 			if ( ! s.hasContent ) {
-				
+
 				// If data is available, append data to url
 				if ( s.data ) {
 					s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
 				}
-								
+
 				// Add anti-cache in url if needed
 				if ( s.cache === false ) {
-					
+
 					var ts = jQuery.now(),
 						// try replacing _= if it is there
 						ret = s.url.replace( rts , "$1_=" + ts );
-						
+
 					// if nothing was replaced, add timestamp to the end
 					s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
 				}
 			}
-			
+
 			// Set the correct header, if data is being sent
 			if ( ( s.data && s.hasContent ) || options.contentType ) {
 				requestHeaders[ "content-type" ] = s.contentType;
 			}
-		
+
 			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 			if ( s.ifModified ) {
-				if ( jQuery_lastModified[ s.url ] ) { 
+				if ( jQuery_lastModified[ s.url ] ) {
 					requestHeaders[ "if-modified-since" ] = jQuery_lastModified[ s.url ];
 				}
 				if ( jQuery_etag[ s.url ] ) {
 					requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
 				}
 			}
-		
+
 			// Set the Accepts header for the server, depending on the dataType
 			requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
 				s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
 				s.accepts[ "*" ];
-				
+
 			// Check for headers option
 			for ( i in s.headers ) {
 				requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
 			}
-			
+
 			// Allow custom headers/mimetypes and early abort
 			if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
-					
+
 					// Abort if not done already
 					done( 0 , "abort" );
 					jXHR = false;
-					
+
 			} else {
-				
+
 				// Set state as sending
 				state = 1;
 				jXHR.readyState = 1;
-				
+
 				// Install callbacks on deferreds
 				for ( i in { success:1, error:1, complete:1 } ) {
 					jXHR[ i ]( s[ i ] );
 				}
-				
+
 				// Send global event
 				if ( s.global ) {
 					globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] );
 				}
-				
+
 				// Timeout
 				if ( s.async && s.timeout > 0 ) {
 					timeoutTimer = setTimeout(function(){
 						jXHR.abort( "timeout" );
 					}, s.timeout);
 				}
-				
+
 				// Try to send
 				try {
 					transport.send(requestHeaders, done);
@@ -622,7 +622,7 @@ jQuery.extend({
 
 						done(0, "error", "" + e);
 						jXHR = false;
-						
+
 					// Simply rethrow otherwise
 					} else {
 						jQuery.error(e);
@@ -630,7 +630,7 @@ jQuery.extend({
 				}
 			}
 		}
-		
+
 		return jXHR;
 	},
 
@@ -733,13 +733,13 @@ function ajax_selectOrExecute( structure , s ) {
 		checked = {},
 		flag,
 		noSelect = structure !== "transports";
-		
+
 	function initSearch( dataType ) {
 
 		flag = transportDataType !== dataType && ! checked[ dataType ];
-		
+
 		if ( flag ) {
-			
+
 			checked[ dataType ] = 1;
 			transportDataType = dataType;
 			list = s[ structure ][ dataType ];
@@ -749,15 +749,15 @@ function ajax_selectOrExecute( structure , s ) {
 
 		return flag;
 	}
-	
+
 	initSearch( dataTypes[ 0 ] );
 
 	for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
-		
+
 		if ( i === length ) {
-			
+
 			initSearch( "*" );
-			
+
 		} else {
 
 			selected = list[ i ]( s , determineDataType );
@@ -778,7 +778,7 @@ function ajax_selectOrExecute( structure , s ) {
 
 // Add an element to one of the structures in ajaxSettings
 function ajax_addElement( structure , args ) {
-		
+
 	var i,
 		start = 0,
 		length = args.length,
@@ -789,41 +789,41 @@ function ajax_addElement( structure , args ) {
 		first,
 		append,
 		list;
-		
+
 	if ( length ) {
-		
+
 		first = jQuery.type( args[ 0 ] );
-		
+
 		if ( first === "object" ) {
 			return ajax_selectOrExecute( structure , args[ 0 ] );
 		}
-		
+
 		structure = jQuery.ajaxSettings[ structure ];
-		
+
 		if ( first !== "function" ) {
-			
+
 			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
 			dLength = dataTypes.length;
 			start = 1;
-			
+
 		}
-		
+
 		if ( dLength && start < length ) {
-			
+
 			functors = sliceFunc.call( args , start );
-					
+
 			for( i = 0 ; i < dLength ; i++ ) {
-				
+
 				dataType = dataTypes[ i ];
-				
+
 				first = /^\+/.test( dataType );
-				
+
 				if (first) {
 					dataType = dataType.substr(1);
 				}
-				
+
 				if ( dataType !== "" ) {
-				
+
 					append = Array.prototype[ first ? "unshift" : "push" ];
 					list = structure[ dataType ] = structure[ dataType ] || [];
 					append.apply( list , functors );
@@ -831,7 +831,7 @@ function ajax_addElement( structure , args ) {
 			}
 		}
 	}
-	
+
 	return jQuery.ajax;
 }
 
@@ -842,18 +842,18 @@ jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
 		return ajax_addElement( _ , arguments );
 	};
 } );
-	
+
 // Utility function that handles dataType when response is received
 // (for those transports that can give text or xml responses)
 function determineDataType( s , ct , text , xml ) {
-	
+
 	var contents = s.contents,
 		type,
 		regexp,
 		dataTypes = s.dataTypes,
 		transportDataType = dataTypes[0],
 		response;
-	
+
 	// Auto (xml, json, script or text determined given headers)
 	if ( transportDataType === "*" ) {
 
@@ -862,30 +862,30 @@ function determineDataType( s , ct , text , xml ) {
 				transportDataType = dataTypes[0] = type;
 				break;
 			}
-		}			
-	} 
-	
+		}
+	}
+
 	// xml and parsed as such
 	if ( transportDataType === "xml" &&
 		xml &&
 		xml.documentElement /* #4958 */ ) {
-		
+
 		response = xml;
-	
+
 	// Text response was provided
 	} else {
-		
+
 		response = text;
-		
+
 		// If it's not really text, defer to converters
 		if ( transportDataType !== "text" ) {
 			dataTypes.unshift( "text" );
 		}
-		
+
 	}
-	
+
 	return response;
-}	
+}
 
 /*
  * Create the request object; Microsoft failed to properly
diff --git a/src/core.js b/src/core.js
index 59a89d2d2..93a051610 100644
--- a/src/core.js
+++ b/src/core.js
@@ -59,7 +59,7 @@ var jQuery = function( selector, context ) {
 
 	// Has the ready events already been bound?
 	readyBound = false,
-	
+
 	// The deferred used on DOM ready
 	readyList,
 
@@ -252,11 +252,11 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-	
+
 	ready: function() {
 		// Attach the listeners
 		jQuery.bindReady();
-		
+
 		// Change ready & apply
 		return ( jQuery.fn.ready = readyList.complete ).apply( this , arguments );
 	},
@@ -406,7 +406,7 @@ jQuery.extend({
 
 			// If there are functions bound, to execute
 			readyList.fire( document , [ jQuery ] );
-			
+
 			// Trigger any bound ready events
 			if ( jQuery.fn.trigger ) {
 				jQuery( document ).trigger( "ready" ).unbind( "ready" );
@@ -543,7 +543,7 @@ jQuery.extend({
 			jQuery.error( "Invalid JSON: " + data );
 		}
 	},
-	
+
 	// Cross-browser xml parsing
 	// (xml & tmp used internally)
 	parseXML: function( data , xml , tmp ) {
@@ -556,13 +556,13 @@ jQuery.extend({
 			xml.async = "false";
 			xml.loadXML( data );
 		}
-		
+
 		tmp = xml.documentElement;
-		
+
 		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
 			jQuery.error( "Invalid XML: " + data );
 		}
-		
+
 		return xml;
 	},
 
@@ -800,10 +800,10 @@ jQuery.extend({
 	now: function() {
 		return (new Date()).getTime();
 	},
-	
+
 	// Create a simple deferred (one callbacks list)
 	_Deferred: function() {
-		
+
 		var // callbacks list
 			callbacks = [],
 			// stored [ context , args ]
@@ -814,24 +814,24 @@ jQuery.extend({
 			cancelled,
 			// the deferred itself
 			deferred  = {
-				
+
 				// complete( f1, f2, ...)
 				complete: function () {
-					
+
 					if ( ! cancelled ) {
-						
+
 						var args = arguments,
 							i,
 							length,
 							elem,
 							type,
 							_fired;
-							
+
 						if ( fired ) {
 							_fired = fired;
 							fired = 0;
 						}
-						
+
 						for ( i = 0, length = args.length ; i < length ; i++ ) {
 							elem = args[ i ];
 							type = jQuery.type( elem );
@@ -841,21 +841,21 @@ jQuery.extend({
 								callbacks.push( elem );
 							}
 						}
-						
+
 						if ( _fired ) {
 							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
 						}
 					}
-					
+
 					return this;
 				},
-				
+
 				// resolve with given context and args
 				fire: function( context , args ) {
 					if ( ! cancelled && ! fired && ! firing ) {
-						
+
 						firing = 1;
-						
+
 						try {
 							while( callbacks[ 0 ] ) {
 								callbacks.shift().apply( context , args );
@@ -868,18 +868,18 @@ jQuery.extend({
 					}
 					return this;
 				},
-				
+
 				// resolve with this as context and given arguments
 				resolve: function() {
 					deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
 					return this;
 				},
-				
+
 				// Has this deferred been resolved?
 				isResolved: function() {
 					return !!( firing || fired );
 				},
-				
+
 				// Cancel
 				cancel: function() {
 					cancelled = 1;
@@ -887,18 +887,18 @@ jQuery.extend({
 					return this;
 				}
 			};
-		
+
 		return deferred;
 	},
-	
+
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
 	Deferred: function( func ) {
-		
+
 		var deferred = jQuery._Deferred(),
 			failDeferred = jQuery._Deferred();
-			
-		// Add errorDeferred methods and redefine cancel			
+
+		// Add errorDeferred methods and redefine cancel
 		jQuery.extend( deferred , {
 
 		    then: function( completeCallbacks , failCallbacks ) {
@@ -923,18 +923,18 @@ jQuery.extend({
 			}
 
 		} );
-		
+
 		// Make sure only one callback list will be used
 		deferred.then( failDeferred.cancel , deferred.cancel );
-		
+
 		// Unexpose cancel
 		delete deferred.cancel;
-		
+
 		// Call given func if any
 		if ( func ) {
 			func.call( deferred , deferred );
 		}
-		
+
 		return deferred;
 	},
 
diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index aa30b5dda..5cfb7834a 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -15,11 +15,11 @@ jQuery.ajaxSettings.jsonpCallback = function() {
 // 3) ensure options jsonp is always provided so that jsonp requests are always
 //    json request with the jsonp option set
 jQuery.ajax.prefilter("json jsonp", function(s) {
-	
+
 	var transportDataType = s.dataTypes[ 0 ];
-	
+
 	s.dataTypes[ 0 ] = "json";
-	
+
 	if ( s.jsonp ||
 		transportDataType === "jsonp" ||
 		transportDataType === "json" && ( jsre.test(s.url) || typeof(s.data) === "string" && jsre.test(s.data) ) ) {
@@ -29,34 +29,34 @@ jQuery.ajax.prefilter("json jsonp", function(s) {
 				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
 			url = s.url.replace(jsre, "=" + jsonpCallback + "$1"),
 			data = s.url == url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
-			
+
 		if ( url == s.url && data == s.data ) {
 			url = url += (rquery_jsonp.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
 		}
-		
+
 		s.url = url;
 		s.data = data;
 	}
-	
+
 // Bind transport to json dataType
 }).transport("json", function(s) {
 
 	if ( s.jsonp ) {
-		
+
 		// Put callback in place
 		var responseContainer,
 			jsonpCallback = s.jsonpCallback,
 			previous = window[ jsonpCallback ];
-			
+
 		window [ jsonpCallback ] = function( response ) {
 			responseContainer = [response];
 		};
-		
+
 		s.complete = [function() {
 
 			// Set callback back to previous value
 			window[ jsonpCallback ] = previous;
-			
+
 			// Call if it was a function and we have a response
 			if ( previous) {
 				if ( responseContainer && jQuery.isFunction ( previous ) ) {
@@ -66,9 +66,9 @@ jQuery.ajax.prefilter("json jsonp", function(s) {
 				// else, more memory leak avoidance
 				try{ delete window[ jsonpCallback ]; } catch(e){}
 			}
-			
+
 		}, s.complete ];
-				
+
 		// Use data converter to retrieve json after script execution
 		s.converters["script json"] = function() {
 			if ( ! responseContainer ) {
@@ -76,7 +76,7 @@ jQuery.ajax.prefilter("json jsonp", function(s) {
 			}
 			return responseContainer[ 0 ];
 		};
-		
+
 		// Delegate to script transport
 		return "script";
 	}
diff --git a/src/transports/script.js b/src/transports/script.js
index d18f4d76e..0db0de6c7 100644
--- a/src/transports/script.js
+++ b/src/transports/script.js
@@ -6,11 +6,11 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 	accepts: {
 		script: "text/javascript, application/javascript"
 	},
-	
+
 	contents: {
 		script: /javascript/
 	},
-		
+
 	converters: {
 		"text script": jQuery.globalEval
 	}
@@ -18,22 +18,22 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 
 // Bind script tag hack transport
 jQuery.ajax.transport("script", function(s) {
-	
+
 	// Handle cache special case
 	if ( s.cache === undefined ) {
 		s.cache = false;
 	}
-	
+
 	// This transport only deals with cross domain get requests
 	if ( s.crossDomain && s.async && ( s.type === "GET" || ! s.data ) ) {
-		
+
 		s.global = false;
-		
+
 		var script,
 			head = document.getElementsByTagName("head")[0] || document.documentElement;
-		
+
 		return {
-			
+
 			send: function(_, callback) {
 
 				script = document.createElement("script");
@@ -43,24 +43,24 @@ jQuery.ajax.transport("script", function(s) {
 				if ( s.scriptCharset ) {
 					script.charset = s.scriptCharset;
 				}
-				
+
 				script.src = s.url;
-				
+
 				// Attach handlers for all browsers
 				script.onload = script.onreadystatechange = function( _ , statusText) {
-					
+
 					if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) {
-								
+
 						// Handle memory leak in IE
 						script.onload = script.onreadystatechange = null;
-						
+
 						// Remove the script
 						if ( head && script.parentNode ) {
 							head.removeChild( script );
 						}
-						
+
 						script = 0;
-						
+
 						// Callback
 						callback( statusText ? 0 : 200, statusText || "success" );
 					}
@@ -69,7 +69,7 @@ jQuery.ajax.transport("script", function(s) {
 				// This arises when a base node is used (#2709 and #4378).
 				head.insertBefore( script, head.firstChild );
 			},
-			
+
 			abort: function(statusText) {
 				if ( script ) {
 					script.onload( 0 , statusText );
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
index 5845087b8..7d7140259 100644
--- a/src/transports/xhr.js
+++ b/src/transports/xhr.js
@@ -2,28 +2,28 @@
 
 var // Next fake timer id
 	xhrPollingId = jQuery.now(),
-	
+
 	// Callbacks hashtable
 	xhrs = {},
 
 	// #5280: see end of file
 	xhrUnloadAbortMarker = [];
 
-	
+
 jQuery.ajax.transport( function( s , determineDataType ) {
-	
+
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {
-		
+
 		var callback;
-		
+
 		return {
-			
+
 			send: function(headers, complete) {
-				
+
 				var xhr = s.xhr(),
 					handle;
-				
+
 				// Open the socket
 				// Passing null username, generates a login popup on Opera (#2865)
 				if ( s.username ) {
@@ -31,7 +31,7 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				} else {
 					xhr.open(s.type, s.url, s.async);
 				}
-				
+
 				// Requested-With header
 				// Not set for crossDomain requests with no content
 				// (see why at http://trac.dojotoolkit.org/ticket/9486)
@@ -39,16 +39,16 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) {
 					headers["x-requested-with"] = "XMLHttpRequest";
 				}
-				
+
 				// Need an extra try/catch for cross domain requests in Firefox 3
 				try {
-					
+
 					jQuery.each(headers, function(key,value) {
 						xhr.setRequestHeader(key,value);
 					});
-					
+
 				} catch(_) {}
-				
+
 				// Do send the request
 				try {
 					xhr.send( ( s.hasContent && s.data ) || null );
@@ -56,55 +56,55 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 					complete(0, "error", "" + e);
 					return;
 				}
-				
+
 				// Listener
 				callback = function ( abortStatusText ) {
-					
+
 					// Was never called and is aborted or complete
 					if ( callback && ( abortStatusText || xhr.readyState === 4 ) ) {
-					
+
 						// Do not listen anymore
 						if (handle) {
 							xhr.onreadystatechange = jQuery.noop;
 							delete xhrs[ handle ];
 							handle = undefined;
 						}
-						
+
 						callback = 0;
-						
+
 						// Get info
 						var status, statusText, response, responseHeaders;
-							
+
 						if ( abortStatusText ) {
-							
+
 							if ( xhr.readyState !== 4 ) {
 								xhr.abort();
 							}
-							
+
 							// Stop here if unloadAbort
 							if ( abortStatusText === xhrUnloadAbortMarker ) {
 								return;
 							}
-							
+
 							status = 0;
 							statusText = abortStatusText;
-							
+
 						} else {
-							
+
 							status = xhr.status;
-							
+
 							try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests
-								
+
 								statusText = xhr.statusText;
-								
+
 							} catch( e ) {
-								
+
 								statusText = ""; // We normalize with Webkit giving an empty statusText
-								
+
 							}
-							
+
 							responseHeaders = xhr.getAllResponseHeaders();
-							
+
 							// Filter status for non standard behaviours
 							// (so many they seem to be the actual "standard")
 							status =
@@ -129,10 +129,10 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 											:
 											status
 									);
-									
+
 							// Guess response if needed & update datatype accordingly
 							if ( status >= 200 && status < 300 ) {
-								response = 
+								response =
 									determineDataType(
 										s,
 										xhr.getResponseHeader("content-type"),
@@ -140,30 +140,30 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 										xhr.responseXML );
 							}
 						}
-						
+
 						// Call complete
 						complete(status,statusText,response,responseHeaders);
 					}
 				};
-				
+
 				// if we're in sync mode
 				// or it's in cache and has been retrieved directly (IE6 & IE7)
 				// we need to manually fire the callback
 				if ( ! s.async || xhr.readyState === 4 ) {
-					
+
 					callback();
-					
+
 				} else {
-					
+
 					// Listener is externalized to handle abort on unload
 					handle = xhrPollingId++;
 					xhrs[ handle ] = xhr;
 					xhr.onreadystatechange = function() {
 						callback();
 					};
-				}					
+				}
 			},
-			
+
 			abort: function(statusText) {
 				if ( callback ) {
 					callback(statusText);
@@ -175,17 +175,17 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 
 // #5280: we need to abort on unload or IE will keep connections alive
 jQuery(window).bind( "unload" , function() {
-	
+
 	// Abort all pending requests
 	jQuery.each(xhrs, function(_, xhr) {
 		if ( xhr.onreadystatechange ) {
 			xhr.onreadystatechange( xhrUnloadAbortMarker );
 		}
 	});
-	
+
 	// Resest polling structure to be safe
 	xhrs = {};
-	
+
 });
 
 })( jQuery );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 270d32f8b..a0697fed1 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1638,7 +1638,7 @@ test("jQuery ajax - failing cross-domain", function() {
 	stop();
 
 	var i = 2;
-	
+
 	if ( jQuery.ajax({
 		url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
 		success: function(){ ok( false , "success" ); },
@@ -1648,7 +1648,7 @@ test("jQuery ajax - failing cross-domain", function() {
 		ok( true , "no transport" );
 		if ( ! --i ) start();
 	}
-	
+
 	if ( jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
@@ -1658,7 +1658,7 @@ test("jQuery ajax - failing cross-domain", function() {
 		ok( true , "no transport" );
 		if ( ! --i ) start();
 	}
-	
+
 });
 
 test("jQuery ajax - atom+xml", function() {
diff --git a/test/unit/core.js b/test/unit/core.js
index 1baf6c231..ef06e7ac2 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -151,7 +151,7 @@ test("selector state", function() {
 	test = jQuery("#main").eq(0);
 	equals( test.selector, "#main.slice(0,1)", "#main eq Selector" );
 	equals( test.context, document, "#main eq Context" );
-	
+
 	var d = "<div />";
 	equals(
 		jQuery(d).appendTo(jQuery(d)).selector,
@@ -253,38 +253,38 @@ test("isPlainObject", function() {
 
 	// The use case that we want to match
 	ok(jQuery.isPlainObject({}), "{}");
-	
+
 	// Not objects shouldn't be matched
 	ok(!jQuery.isPlainObject(""), "string");
 	ok(!jQuery.isPlainObject(0) && !jQuery.isPlainObject(1), "number");
 	ok(!jQuery.isPlainObject(true) && !jQuery.isPlainObject(false), "boolean");
 	ok(!jQuery.isPlainObject(null), "null");
 	ok(!jQuery.isPlainObject(undefined), "undefined");
-	
+
 	// Arrays shouldn't be matched
 	ok(!jQuery.isPlainObject([]), "array");
- 
+
 	// Instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new Date), "new Date");
- 
+
 	var fn = function(){};
- 
+
 	// Functions shouldn't be matched
 	ok(!jQuery.isPlainObject(fn), "fn");
- 
+
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn (no methods)");
- 
+
 	// Makes the function a little more realistic
 	// (and harder to detect, incidentally)
 	fn.prototype = {someMethod: function(){}};
- 
+
 	// Again, instantiated objects shouldn't be matched
 	ok(!jQuery.isPlainObject(new fn), "new fn");
 
 	// DOM Element
 	ok(!jQuery.isPlainObject(document.createElement("div")), "DOM Element");
-	
+
 	// Window
 	ok(!jQuery.isPlainObject(window), "window");
 
@@ -298,7 +298,7 @@ test("isPlainObject", function() {
 			document.body.removeChild( iframe );
 			start();
 		};
- 
+
 		var doc = iframe.contentDocument || iframe.contentWindow.document;
 		doc.open();
 		doc.write("<body onload='window.parent.iframeDone(Object);'>");
@@ -659,7 +659,7 @@ test("jQuery.merge()", function() {
 
 	// Fixed at [5998], #3641
 	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
-	
+
 	// After fixing #5527
 	same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values");
 	same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like");
@@ -694,7 +694,7 @@ test("jQuery.extend(Object, Object)", function() {
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
 	ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" );
-	
+
 	// #5991
 	ok( jQuery.isArray( jQuery.extend(true, { arr: {} }, nestedarray).arr ), "Cloned array heve to be an Array" );
 	ok( jQuery.isPlainObject( jQuery.extend(true, { arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
@@ -715,13 +715,13 @@ test("jQuery.extend(Object, Object)", function() {
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
-	
+
 	// Makes the class a little more realistic
 	myKlass.prototype = { someMethod: function(){} };
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" );
-	
+
 	var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
 	ok( ret.foo == 5, "Wrapped numbers copy correctly" );
 
@@ -849,10 +849,10 @@ test("jQuery.makeArray", function(){
 
 test("jQuery.isEmptyObject", function(){
 	expect(2);
-	
+
 	equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
 	equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );
-	
+
 	// What about this ?
 	// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
 });
@@ -878,23 +878,23 @@ test("jQuery.proxy", function(){
 
 test("jQuery.parseJSON", function(){
 	expect(8);
-	
+
 	equals( jQuery.parseJSON(), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( null ), null, "Nothing in, null out." );
 	equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." );
-	
+
 	same( jQuery.parseJSON("{}"), {}, "Plain object parsing." );
 	same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." );
 
 	same( jQuery.parseJSON('\n{"test":1}'), {"test":1}, "Make sure leading whitespaces are handled." );
-	
+
 	try {
 		jQuery.parseJSON("{a:1}");
 		ok( false, "Test malformed JSON string." );
 	} catch( e ) {
 		ok( true, "Test malformed JSON string." );
 	}
-	
+
 	try {
 		jQuery.parseJSON("{'a':1}");
 		ok( false, "Test malformed JSON string." );
@@ -904,48 +904,48 @@ test("jQuery.parseJSON", function(){
 });
 
 test("jQuery._Deferred()", function() {
-	
+
 	expect( 10 );
-	
+
 	var deferred,
 		object,
 		test;
-	
+
 	deferred = jQuery._Deferred();
-		
+
 	test = false;
-		
+
 	deferred.complete( function( value ) {
 		equals( value , "value" , "Test pre-resolve callback" );
 		test = true;
 	} );
-	
+
 	deferred.resolve( "value" );
-	
+
 	ok( test , "Test pre-resolve callbacks called right away" );
 
 	test = false;
-	
+
 	deferred.complete( function( value ) {
 		equals( value , "value" , "Test post-resolve callback" );
 		test = true;
 	} );
-	
+
 	ok( test , "Test post-resolve callbacks called right away" );
-	
+
 	deferred.cancel();
-	
+
 	test = true;
-	
+
 	deferred.complete( function() {
 		ok( false , "Cancel was ignored" );
 		test = false;
 	} );
-	
+
 	ok( test , "Test cancel" );
-	
+
 	deferred = jQuery._Deferred().resolve();
-	
+
 	try {
 		deferred.complete( function() {
 			throw "Error";
@@ -956,77 +956,77 @@ test("jQuery._Deferred()", function() {
 		strictEqual( e , "Error" , "Test deferred propagates exceptions");
 		deferred.complete();
 	}
-	
+
 	test = "";
 	deferred = jQuery._Deferred().complete( function() {
-		
+
 		test += "A";
-		
+
 	}, function() {
-		
+
 		test += "B";
-		
+
 	} ).resolve();
-	
+
 	strictEqual( test , "AB" , "Test multiple complete parameters" );
-	
+
 	test = "";
-	
+
 	deferred.complete( function() {
-		
+
 		deferred.complete( function() {
-			
+
 			test += "C";
-			
+
 		} );
-		
+
 		test += "A";
-		
+
 	}, function() {
-		
+
 		test += "B";
 	} );
-	
+
 	strictEqual( test , "ABC" , "Test complete callbacks order" );
-	
+
 	deferred = jQuery._Deferred();
-	
+
 	deferred.fire( jQuery , [ document ] ).complete( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });
 
 test("jQuery.Deferred()", function() {
-	
+
 	expect( 4 );
-	
+
 	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
 		this.resolve( "done" );
 	}).then( function( value ) {
 		strictEqual( value , "done" , "Passed function executed" );
 	});
-	
+
 	jQuery.Deferred().resolve().then( function() {
 		ok( true , "Success on resolve" );
 	}, function() {
 		ok( false , "Error on resolve" );
 	});
-	
+
 	jQuery.Deferred().reject().then( function() {
 		ok( false , "Success on reject" );
 	}, function() {
 		ok( true , "Error on reject" );
 	});
 });
-	
+
 test("jQuery.when()", function() {
-	
+
 	expect( 21 );
-	
+
 	// Some other objects
 	jQuery.each( {
-		
+
 		"an empty string": "",
 		"a non-empty string": "some string",
 		"zero": 0,
@@ -1036,17 +1036,17 @@ test("jQuery.when()", function() {
 		"null": null,
 		"undefined": undefined,
 		"a plain object": {}
-	
+
 	} , function( message , value ) {
-		
+
 		ok( jQuery.isFunction( jQuery.when( value ).then( function( resolveValue ) {
 			strictEqual( resolveValue , value , "Test the promise was resolved with " + message );
 		} ).promise ) , "Test " + message + " triggers the creation of a new Promise" );
-		
+
 	} );
-	
+
 	var cache, i;
-	
+
 	for( i = 1 ; i < 4 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );

From c43b078c6911027fd4124d542446ad0098662f6a Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 6 Jan 2011 01:17:31 +0100
Subject: [PATCH 076/110] Renamed src/transports to src/ajax (in case we need
 prefilters in the future and to avoid a separate prefilters directory).

---
 Makefile                           | 6 +++---
 Rakefile                           | 6 +++---
 build.xml                          | 6 +++---
 src/{transports => ajax}/jsonp.js  | 0
 src/{transports => ajax}/script.js | 0
 src/{transports => ajax}/xhr.js    | 0
 test/index.html                    | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{transports => ajax}/jsonp.js (100%)
 rename src/{transports => ajax}/script.js (100%)
 rename src/{transports => ajax}/xhr.js (100%)

diff --git a/Makefile b/Makefile
index cf985549b..6a71722be 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,9 @@ BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.js\
-	${SRC_DIR}/transports/jsonp.js\
-	${SRC_DIR}/transports/script.js\
-	${SRC_DIR}/transports/xhr.js\
+	${SRC_DIR}/ajax/jsonp.js\
+	${SRC_DIR}/ajax/script.js\
+	${SRC_DIR}/ajax/xhr.js\
 	${SRC_DIR}/effects.js\
 	${SRC_DIR}/offset.js\
 	${SRC_DIR}/dimensions.js
diff --git a/Rakefile b/Rakefile
index fd5fc1813..bf7ee2b58 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,9 +22,9 @@ base_files = %w{
   manipulation
   css
   ajax
-  transports/jsonp
-  transports/script
-  transports/xhr
+  ajax/jsonp
+  ajax/script
+  ajax/xhr
   effects
   offset
   dimensions
diff --git a/build.xml b/build.xml
index d4cd39d0d..87b31e192 100644
--- a/build.xml
+++ b/build.xml
@@ -63,9 +63,9 @@
 			<fileset file="src/manipulation.js" />
 			<fileset file="src/css.js" />
 			<fileset file="src/ajax.js" />
-			<fileset file="src/transports/jsonp.js" />
-			<fileset file="src/transports/script.js" />
-			<fileset file="src/transports/xhr.js" />
+			<fileset file="src/ajax/jsonp.js" />
+			<fileset file="src/ajax/script.js" />
+			<fileset file="src/ajax/xhr.js" />
 			<fileset file="src/effects.js" />
 			<fileset file="src/offset.js" />
 			<fileset file="src/dimensions.js" />
diff --git a/src/transports/jsonp.js b/src/ajax/jsonp.js
similarity index 100%
rename from src/transports/jsonp.js
rename to src/ajax/jsonp.js
diff --git a/src/transports/script.js b/src/ajax/script.js
similarity index 100%
rename from src/transports/script.js
rename to src/ajax/script.js
diff --git a/src/transports/xhr.js b/src/ajax/xhr.js
similarity index 100%
rename from src/transports/xhr.js
rename to src/ajax/xhr.js
diff --git a/test/index.html b/test/index.html
index accd349f9..bbeda63a6 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,9 +20,9 @@
 	<script src="../src/manipulation.js"></script>
 	<script src="../src/css.js"></script>
 	<script src="../src/ajax.js"></script>
-	<script src="../src/transports/jsonp.js"></script>
-	<script src="../src/transports/script.js"></script>
-	<script src="../src/transports/xhr.js"></script>
+	<script src="../src/ajax/jsonp.js"></script>
+	<script src="../src/ajax/script.js"></script>
+	<script src="../src/ajax/xhr.js"></script>
 	<script src="../src/effects.js"></script>
 	<script src="../src/offset.js"></script>
 	<script src="../src/dimensions.js"></script>

From 47e4cc1a0f3f26cf86d485fd53066503c4272e6b Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 6 Jan 2011 01:18:03 +0100
Subject: [PATCH 077/110] Fixed mixing of tabs & spaces to make JSLint happier.

---
 src/core.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core.js b/src/core.js
index 93a051610..77f9fcebd 100644
--- a/src/core.js
+++ b/src/core.js
@@ -901,10 +901,10 @@ jQuery.extend({
 		// Add errorDeferred methods and redefine cancel
 		jQuery.extend( deferred , {
 
-		    then: function( completeCallbacks , failCallbacks ) {
-		    	deferred.complete( completeCallbacks ).fail( failCallbacks );
-		    	return this;
-		    },
+			then: function( completeCallbacks , failCallbacks ) {
+				deferred.complete( completeCallbacks ).fail( failCallbacks );
+				return this;
+			},
 			fail: failDeferred.complete,
 			fireReject: failDeferred.fire,
 			reject: failDeferred.resolve,

From 1ca82ccd9489f11d3a8fbdd8a32b4c164ffaf483 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 6 Jan 2011 01:26:06 +0100
Subject: [PATCH 078/110] Renamed "complete" to "done" in order to avoid
 conflicts with jXHR.complete.

---
 src/ajax.js       |  4 ++--
 src/core.js       | 16 ++++++++--------
 test/unit/core.js | 22 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index d78542d02..7988ab1ef 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -496,9 +496,9 @@ jQuery.extend({
 
 		// Attach deferreds
 		deferred.promise( jXHR );
-		jXHR.success = jXHR.complete;
+		jXHR.success = jXHR.done;
 		jXHR.error = jXHR.fail;
-		jXHR.complete = completeDeferred.complete;
+		jXHR.complete = completeDeferred.done;
 
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
diff --git a/src/core.js b/src/core.js
index 77f9fcebd..b9e6d816f 100644
--- a/src/core.js
+++ b/src/core.js
@@ -258,7 +258,7 @@ jQuery.fn = jQuery.prototype = {
 		jQuery.bindReady();
 
 		// Change ready & apply
-		return ( jQuery.fn.ready = readyList.complete ).apply( this , arguments );
+		return ( jQuery.fn.ready = readyList.done ).apply( this , arguments );
 	},
 
 	eq: function( i ) {
@@ -815,8 +815,8 @@ jQuery.extend({
 			// the deferred itself
 			deferred  = {
 
-				// complete( f1, f2, ...)
-				complete: function () {
+				// done( f1, f2, ...)
+				done: function () {
 
 					if ( ! cancelled ) {
 
@@ -836,7 +836,7 @@ jQuery.extend({
 							elem = args[ i ];
 							type = jQuery.type( elem );
 							if ( type === "array" ) {
-								deferred.complete.apply( deferred , elem );
+								deferred.done.apply( deferred , elem );
 							} else if ( type === "function" ) {
 								callbacks.push( elem );
 							}
@@ -901,11 +901,11 @@ jQuery.extend({
 		// Add errorDeferred methods and redefine cancel
 		jQuery.extend( deferred , {
 
-			then: function( completeCallbacks , failCallbacks ) {
-				deferred.complete( completeCallbacks ).fail( failCallbacks );
+			then: function( doneCallbacks , failCallbacks ) {
+				deferred.done( doneCallbacks ).fail( failCallbacks );
 				return this;
 			},
-			fail: failDeferred.complete,
+			fail: failDeferred.done,
 			fireReject: failDeferred.fire,
 			reject: failDeferred.resolve,
 			isRejected: failDeferred.isResolved,
@@ -913,7 +913,7 @@ jQuery.extend({
 			// If obj is provided, the promise aspect is added to the object
 			promise: function( obj ) {
 				obj = obj || {};
-				jQuery.each( "then complete fail isResolved isRejected".split( " " ) , function( _ , method ) {
+				jQuery.each( "then done fail isResolved isRejected".split( " " ) , function( _ , method ) {
 					obj[ method ] = deferred[ method ];
 				});
 				obj.promise = function() {
diff --git a/test/unit/core.js b/test/unit/core.js
index ef06e7ac2..8fd060578 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -915,7 +915,7 @@ test("jQuery._Deferred()", function() {
 
 	test = false;
 
-	deferred.complete( function( value ) {
+	deferred.done( function( value ) {
 		equals( value , "value" , "Test pre-resolve callback" );
 		test = true;
 	} );
@@ -926,7 +926,7 @@ test("jQuery._Deferred()", function() {
 
 	test = false;
 
-	deferred.complete( function( value ) {
+	deferred.done( function( value ) {
 		equals( value , "value" , "Test post-resolve callback" );
 		test = true;
 	} );
@@ -937,7 +937,7 @@ test("jQuery._Deferred()", function() {
 
 	test = true;
 
-	deferred.complete( function() {
+	deferred.done( function() {
 		ok( false , "Cancel was ignored" );
 		test = false;
 	} );
@@ -947,18 +947,18 @@ test("jQuery._Deferred()", function() {
 	deferred = jQuery._Deferred().resolve();
 
 	try {
-		deferred.complete( function() {
+		deferred.done( function() {
 			throw "Error";
 		} , function() {
 			ok( true , "Test deferred do not cancel on exception" );
 		} );
 	} catch( e ) {
 		strictEqual( e , "Error" , "Test deferred propagates exceptions");
-		deferred.complete();
+		deferred.done();
 	}
 
 	test = "";
-	deferred = jQuery._Deferred().complete( function() {
+	deferred = jQuery._Deferred().done( function() {
 
 		test += "A";
 
@@ -968,13 +968,13 @@ test("jQuery._Deferred()", function() {
 
 	} ).resolve();
 
-	strictEqual( test , "AB" , "Test multiple complete parameters" );
+	strictEqual( test , "AB" , "Test multiple done parameters" );
 
 	test = "";
 
-	deferred.complete( function() {
+	deferred.done( function() {
 
-		deferred.complete( function() {
+		deferred.done( function() {
 
 			test += "C";
 
@@ -987,11 +987,11 @@ test("jQuery._Deferred()", function() {
 		test += "B";
 	} );
 
-	strictEqual( test , "ABC" , "Test complete callbacks order" );
+	strictEqual( test , "ABC" , "Test done callbacks order" );
 
 	deferred = jQuery._Deferred();
 
-	deferred.fire( jQuery , [ document ] ).complete( function( doc ) {
+	deferred.fire( jQuery , [ document ] ).done( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });

From 368f2441f64e95fe5dfda318709e795833470903 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Fri, 7 Jan 2011 15:52:58 +0100
Subject: [PATCH 079/110] Added missing commas.

---
 test/unit/ajax.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index a0697fed1..9713506ad 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -135,7 +135,7 @@ test("jQuery.ajax() - success callbacks (oncomplete binding)", function() {
 				.error(function(){ ok(false, "error"); })
 				.complete(function(){ start(); });
 			}
-		})
+		});
 	}, 13);
 });
 
@@ -173,7 +173,7 @@ test("jQuery.ajax() - success callbacks (very late binding)", function() {
 					.complete(function(){ start(); });
 				},100);
 			}
-		})
+		});
 	}, 13);
 });
 
@@ -438,7 +438,7 @@ test("jQuery.ajax context modification", function() {
 
 	stop();
 
-	var obj = {}
+	var obj = {};
 
 	jQuery.ajax({
 		url: url("data/name.html"),
@@ -1522,7 +1522,7 @@ test("data option: evaluate function values (#2806)", function() {
 			equals( result, "key=value" );
 			start();
 		}
-	})
+	});
 });
 
 test("data option: empty bodies for non-GET requests", function() {
@@ -1535,7 +1535,7 @@ test("data option: empty bodies for non-GET requests", function() {
 			equals( result, "" );
 			start();
 		}
-	})
+	});
 });
 
 test("jQuery.ajax - If-Modified-Since support", function() {
@@ -1560,7 +1560,7 @@ test("jQuery.ajax - If-Modified-Since support", function() {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
 					} else {
 						equals(status, "notmodified");
-						ok(data == null, "response body should be empty")
+						ok(data == null, "response body should be empty");
 					}
 					start();
 		        },
@@ -1607,7 +1607,7 @@ test("jQuery.ajax - Etag support", function() {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
 					} else {
 						equals(status, "notmodified");
-						ok(data == null, "response body should be empty")
+						ok(data == null, "response body should be empty");
 					}
 					start();
 		        },

From 98c6c4b2b0afb2754883fc39c5626da3219e81e0 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 04:03:00 +0100
Subject: [PATCH 080/110] Added a simple cache for xhr objects in the xhr
 transport.

---
 src/ajax/xhr.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 7d7140259..032668f68 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -6,6 +6,9 @@ var // Next fake timer id
 	// Callbacks hashtable
 	xhrs = {},
 
+	// XHR pool
+	xhrPool = [],
+
 	// #5280: see end of file
 	xhrUnloadAbortMarker = [];
 
@@ -21,7 +24,7 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 
 			send: function(headers, complete) {
 
-				var xhr = s.xhr(),
+				var xhr = xhrPool.pop() || s.xhr(),
 					handle;
 
 				// Open the socket
@@ -53,6 +56,8 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				try {
 					xhr.send( ( s.hasContent && s.data ) || null );
 				} catch(e) {
+					// Store back in pool
+					xhrPool.push( xhr );
 					complete(0, "error", "" + e);
 					return;
 				}
@@ -64,10 +69,12 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 					if ( callback && ( abortStatusText || xhr.readyState === 4 ) ) {
 
 						// Do not listen anymore
+						// and Store back in pool
 						if (handle) {
 							xhr.onreadystatechange = jQuery.noop;
 							delete xhrs[ handle ];
 							handle = undefined;
+							xhrPool.push( xhr );
 						}
 
 						callback = 0;

From 69497c3fd7ff560be0e47b4c65076915cca756bc Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 04:28:42 +0100
Subject: [PATCH 081/110] Fixes #7881. Setting contentType to false will
 prevent the Content-Type header from being sent. Unit test added.

---
 src/ajax.js           |  2 +-
 test/data/headers.php | 10 +++-------
 test/unit/ajax.js     | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 7988ab1ef..a814d80be 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -559,7 +559,7 @@ jQuery.extend({
 			}
 
 			// Set the correct header, if data is being sent
-			if ( ( s.data && s.hasContent ) || options.contentType ) {
+			if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
 				requestHeaders[ "content-type" ] = s.contentType;
 			}
 
diff --git a/test/data/headers.php b/test/data/headers.php
index c3cb72961..d500b16f4 100644
--- a/test/data/headers.php
+++ b/test/data/headers.php
@@ -6,15 +6,11 @@ $headers = array();
 
 foreach( $_SERVER as $key => $value ) {
 
-	if ( substr( $key , 0 , 5 ) == "HTTP_" ) {
-
-		$key = str_replace( "_" , "-" , substr( $key , 5) );
-		$headers[ $key ] = $value;
-
-	}
+	$key = str_replace( "_" , "-" , substr( $key , 0 , 5 ) == "HTTP_" ? substr( $key , 5 ) : $key );
+	$headers[ $key ] = $value;
 
 }
 
 foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
-	echo "$key: " . $headers[ strtoupper( $key ) ] . "\n";
+	echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
 }
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 9713506ad..d5f2bc0cf 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -276,6 +276,42 @@ test(".ajax() - headers" , function() {
 
 });
 
+test(".ajax() - contentType" , function() {
+
+	expect( 2 );
+
+	stop();
+
+	var count = 2;
+
+	function restart() {
+		if ( ! --count ) {
+			start();
+		}
+	}
+
+	jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+		contentType: "test",
+		success: function( data ) {
+			strictEqual( data , "content-type: test\n" , "Test content-type is sent when options.contentType is set" );
+		},
+		complete: function() {
+			restart();
+		}
+	});
+
+	jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+		contentType: false,
+		success: function( data ) {
+			strictEqual( data , "content-type: \n" , "Test content-type is not sent when options.contentType===false" );
+		},
+		complete: function() {
+			restart();
+		}
+	});
+
+});
+
 test(".ajax() - hash", function() {
 	expect(3);
 

From d515068ee807efef29b6c8406171be4725d7154f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 04:53:29 +0100
Subject: [PATCH 082/110] Fixes #7868. ResponseText is now properly propagated
 for error callbacks.

---
 src/ajax.js                 |  5 +++++
 src/ajax/xhr.js             | 16 +++++++---------
 test/data/errorWithText.php |  5 +++++
 test/unit/ajax.js           | 17 +++++++++++++++++
 4 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 test/data/errorWithText.php

diff --git a/src/ajax.js b/src/ajax.js
index a814d80be..744476f1a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -464,6 +464,11 @@ jQuery.extend({
 			} else { // if not success, mark it as an error
 
 					error = error || statusText;
+
+					// Set responseText if needed
+					if ( response ) {
+						jXHR.responseText = response;
+					}
 			}
 
 			// Set data for the fake xhr object
diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 032668f68..a2ec4a4c5 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -137,15 +137,13 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 											status
 									);
 
-							// Guess response if needed & update datatype accordingly
-							if ( status >= 200 && status < 300 ) {
-								response =
-									determineDataType(
-										s,
-										xhr.getResponseHeader("content-type"),
-										xhr.responseText,
-										xhr.responseXML );
-							}
+							// Guess response & update dataType accordingly
+							response =
+								determineDataType(
+									s,
+									xhr.getResponseHeader("content-type"),
+									xhr.responseText,
+									xhr.responseXML );
 						}
 
 						// Call complete
diff --git a/test/data/errorWithText.php b/test/data/errorWithText.php
new file mode 100644
index 000000000..abd873217
--- /dev/null
+++ b/test/data/errorWithText.php
@@ -0,0 +1,5 @@
+<?php
+
+header("HTTP/1.0 400 Bad Request");
+
+echo "plain text message";
\ No newline at end of file
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index d5f2bc0cf..adf589e1a 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -240,6 +240,23 @@ test("jQuery.ajax() - error callbacks", function() {
 	});
 });
 
+test("jQuery.ajax() - responseText on error", function() {
+
+	expect( 1 );
+
+	stop();
+
+	jQuery.ajax({
+		url: url("data/errorWithText.php"),
+		error: function(xhr) {
+			strictEqual( xhr.responseText , "plain text message" , "Test jXHR.responseText is filled for HTTP errors" );
+		},
+		complete: function() {
+			start();
+		}
+	});
+});
+
 test(".ajax() - headers" , function() {
 
 	expect( 2 );

From afefb4f3d28f47c0a93cc9dfddfcbadb595a8efb Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 06:01:00 +0100
Subject: [PATCH 083/110] Fixes #7465. Reworked the regexp and associated test
 for cross-domain detection so that it now includes ports. Added cross-domain
 detection tests for protocol, hostname and port.

---
 src/ajax.js       |  9 ++++++--
 test/unit/ajax.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 744476f1a..207ef13aa 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -10,7 +10,7 @@ var r20 = /%20/g,
 	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
 	rselectTextarea = /^(?:select|textarea)/i,
 	rts = /([?&])_=[^&]*/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+	rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
 
 	// Slice function
 	sliceFunc = Array.prototype.slice,
@@ -520,7 +520,12 @@ jQuery.extend({
 		// Determine if a cross-domain request is in order
 		var parts = rurl.exec( s.url.toLowerCase() ),
 			loc = location;
-		s.crossDomain = !!( parts && ( parts[ 1 ] && parts[ 1 ] != loc.protocol || parts[ 2 ] != loc.host ) );
+		s.crossDomain = !!(
+				parts &&
+				( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
+					parts[ 2 ] != loc.hostname ||
+					( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
+		);
 
 		// Convert data if not already a string
 		if ( s.data && s.processData && typeof s.data != "string" ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index adf589e1a..14f892857 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -358,6 +358,58 @@ test(".ajax() - hash", function() {
 	});
 });
 
+test("jQuery ajax - cross-domain detection", function() {
+
+	expect( 3 );
+
+	var loc = document.location,
+		otherPort = loc.port === 666 ? 667 : 666,
+		otherProtocol = loc.protocol === "http:" ? "https:" : "http:",
+		protocolFlag,
+		hostFlag,
+		portFlag;
+
+	if ( jQuery.ajax({
+		url: otherProtocol + "//" + loc.host,
+		beforeSend: function( _ , s ) {
+			protocolFlag = 1;
+			ok( s.crossDomain , "Test different protocols are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! protocolFlag ) {
+			ok( ! jQuery.support.cors , "Test different protocols are detected as cross-domain (no transport)" );
+		}
+	}
+
+	if ( jQuery.ajax({
+		url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
+		beforeSend: function( _ , s ) {
+			hostFlag = 1;
+			ok( s.crossDomain , "Test different hostnames are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! hostFlag ) {
+			ok( ! jQuery.support.cors , "Test different hostnames are detected as cross-domain (no transport)" );
+		}
+	}
+
+	if ( jQuery.ajax({
+		url: loc.protocol + "//" + loc.hostname + ":" + otherPort,
+		beforeSend: function( _ , s ) {
+			portFlag = 1;
+			ok( s.crossDomain , "Test different ports are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! portFlag ) {
+			ok( ! jQuery.support.cors , "Test different ports are detected as cross-domain (no transport)" );
+		}
+	}
+
+});
+
 test(".ajax() - 304", function() {
 	expect( 1 );
 	stop();

From 63487505c678152e59847e3ab7878ea5f2514dfa Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 06:19:27 +0100
Subject: [PATCH 084/110] Added a test for retrying a request on error using
 jQuery.ajax(this). Works as intended. Fixes #7461.

---
 test/unit/ajax.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 14f892857..4c8c5009b 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -257,6 +257,29 @@ test("jQuery.ajax() - responseText on error", function() {
 	});
 });
 
+test(".ajax() - retry with jQuery.ajax( this )", function() {
+
+	expect( 1 );
+
+	stop();
+
+	var firstTime = 1;
+
+	jQuery.ajax({
+		url: url("data/errorWithText.php"),
+		error: function() {
+			if ( firstTime ) {
+				firstTime = 0;
+				jQuery.ajax( this );
+			} else {
+				ok( true , "Test retrying with jQuery.ajax(this) works" );
+				start();
+			}
+		}
+	})
+
+});
+
 test(".ajax() - headers" , function() {
 
 	expect( 2 );

From c55a76a23fdf8e9b22d9792a0f3a39051cc33993 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 16:32:51 +0100
Subject: [PATCH 085/110] Make sure prefilters have been called and transport
 has been selected before sending any global event (in case the "global"
 option has been changed).

---
 src/ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 207ef13aa..e910aa56f 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -532,14 +532,14 @@ jQuery.extend({
 			s.data = jQuery.param( s.data , s.traditional );
 		}
 
+		// Get transport
+		transport = jQuery.ajax.prefilter( s ).transport( s );
+
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
 
-		// Get transport
-		transport = jQuery.ajax.prefilter( s ).transport( s );
-
 		// If no transport, we auto-abort
 		if ( ! transport ) {
 

From 5a5f67800b048ae274e644547f4b8e03156ffa49 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 16:50:13 +0100
Subject: [PATCH 086/110] Fixes #5955. Option crossDomain now forces ajax to
 consider a request as cross-domain even when it is not. Useful for when
 servers issue redirects to cross-domain urls. Unit test added.

---
 src/ajax.js       | 15 +++++++++------
 test/unit/ajax.js | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index e910aa56f..eae20e459 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -520,12 +520,15 @@ jQuery.extend({
 		// Determine if a cross-domain request is in order
 		var parts = rurl.exec( s.url.toLowerCase() ),
 			loc = location;
-		s.crossDomain = !!(
-				parts &&
-				( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
-					parts[ 2 ] != loc.hostname ||
-					( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
-		);
+
+		if ( ! s.crossDomain ) {
+			s.crossDomain = !!(
+					parts &&
+					( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
+						parts[ 2 ] != loc.hostname ||
+						( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
+			);
+		}
 
 		// Convert data if not already a string
 		if ( s.data && s.processData && typeof s.data != "string" ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4c8c5009b..8bfd4d3e0 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -383,14 +383,15 @@ test(".ajax() - hash", function() {
 
 test("jQuery ajax - cross-domain detection", function() {
 
-	expect( 3 );
+	expect( 4 );
 
 	var loc = document.location,
 		otherPort = loc.port === 666 ? 667 : 666,
 		otherProtocol = loc.protocol === "http:" ? "https:" : "http:",
 		protocolFlag,
 		hostFlag,
-		portFlag;
+		portFlag,
+		forcedFlag;
 
 	if ( jQuery.ajax({
 		url: otherProtocol + "//" + loc.host,
@@ -431,6 +432,20 @@ test("jQuery ajax - cross-domain detection", function() {
 		}
 	}
 
+	if ( jQuery.ajax({
+		url: loc.protocol + "//" + loc.host,
+		crossDomain: true,
+		beforeSend: function( _ , s ) {
+			forcedFlag = 1;
+			ok( s.crossDomain , "Test forced crossDomain is detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! forcedFlag ) {
+			ok( ! jQuery.support.cors , "Test forced crossDomain is detected as cross-domain (no transport)" );
+		}
+	}
+
 });
 
 test(".ajax() - 304", function() {

From 7bc538623077abb48d94b33ef8e389d1022b13af Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 17:27:29 +0100
Subject: [PATCH 087/110] Simplified cross-domain detection tests.

---
 test/unit/ajax.js | 46 +++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 8bfd4d3e0..d849cff24 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -387,64 +387,44 @@ test("jQuery ajax - cross-domain detection", function() {
 
 	var loc = document.location,
 		otherPort = loc.port === 666 ? 667 : 666,
-		otherProtocol = loc.protocol === "http:" ? "https:" : "http:",
-		protocolFlag,
-		hostFlag,
-		portFlag,
-		forcedFlag;
+		otherProtocol = loc.protocol === "http:" ? "https:" : "http:";
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
+		dataType: "jsonp",
 		url: otherProtocol + "//" + loc.host,
 		beforeSend: function( _ , s ) {
-			protocolFlag = 1;
 			ok( s.crossDomain , "Test different protocols are detected as cross-domain" );
 			return false;
 		}
-	}) === false ) {
-		if ( ! protocolFlag ) {
-			ok( ! jQuery.support.cors , "Test different protocols are detected as cross-domain (no transport)" );
-		}
-	}
+	});
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
+		dataType: "jsonp",
 		url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
 		beforeSend: function( _ , s ) {
-			hostFlag = 1;
 			ok( s.crossDomain , "Test different hostnames are detected as cross-domain" );
 			return false;
 		}
-	}) === false ) {
-		if ( ! hostFlag ) {
-			ok( ! jQuery.support.cors , "Test different hostnames are detected as cross-domain (no transport)" );
-		}
-	}
+	});
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
+		dataType: "jsonp",
 		url: loc.protocol + "//" + loc.hostname + ":" + otherPort,
 		beforeSend: function( _ , s ) {
-			portFlag = 1;
 			ok( s.crossDomain , "Test different ports are detected as cross-domain" );
 			return false;
 		}
-	}) === false ) {
-		if ( ! portFlag ) {
-			ok( ! jQuery.support.cors , "Test different ports are detected as cross-domain (no transport)" );
-		}
-	}
+	});
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
+		dataType: "jsonp",
 		url: loc.protocol + "//" + loc.host,
 		crossDomain: true,
 		beforeSend: function( _ , s ) {
-			forcedFlag = 1;
 			ok( s.crossDomain , "Test forced crossDomain is detected as cross-domain" );
 			return false;
 		}
-	}) === false ) {
-		if ( ! forcedFlag ) {
-			ok( ! jQuery.support.cors , "Test forced crossDomain is detected as cross-domain (no transport)" );
-		}
-	}
+	});
 
 });
 

From 0f28835ee91a8aec5f9de60be42b55b802c67928 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 20:31:15 +0100
Subject: [PATCH 088/110] Make it so prefilters get access to the original
 settings.

---
 src/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ajax.js b/src/ajax.js
index eae20e459..dbea8d5d4 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -536,7 +536,7 @@ jQuery.extend({
 		}
 
 		// Get transport
-		transport = jQuery.ajax.prefilter( s ).transport( s );
+		transport = jQuery.ajax.prefilter( s , options ).transport( s );
 
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {

From 62a1a1a8fa64f92f429a3f5b8ed2e0d1f6fc3d6c Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 21:19:27 +0100
Subject: [PATCH 089/110] Fixes #5803. Reworked jsonp prefilter so that it sets
 the dataType as jsonp and recognizes requests with originalSettings having
 jsonp or jsonpCallback to be jsonp. Moved default jsonp option value into
 ajaxSettings. Attached the transport to "jsonp" which avoids unnecessary
 testing. Transport factory sets dataType back to json for proper data
 conversion.

---
 src/ajax/jsonp.js | 105 +++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 5cfb7834a..0af00567c 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -4,82 +4,81 @@ var jsc = jQuery.now(),
 	jsre = /\=\?(&|$)/,
 	rquery_jsonp = /\?/;
 
-// Default jsonp callback name
-jQuery.ajaxSettings.jsonpCallback = function() {
-	return "jsonp" + jsc++;
-};
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return "jsonp" + jsc++;
+	}
+});
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
-// 2) sneakily ensure transportDataType is json
-// 3) ensure options jsonp is always provided so that jsonp requests are always
-//    json request with the jsonp option set
-jQuery.ajax.prefilter("json jsonp", function(s) {
+// 2) sneakily ensure transportDataType is always jsonp for jsonp requests
+jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
 
-	var transportDataType = s.dataTypes[ 0 ];
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		originalSettings.jsonp ||
+		originalSettings.jsonpCallback ||
+		jsre.test(s.url) ||
+		typeof(s.data) === "string" && jsre.test(s.data) ) {
 
-	s.dataTypes[ 0 ] = "json";
-
-	if ( s.jsonp ||
-		transportDataType === "jsonp" ||
-		transportDataType === "json" && ( jsre.test(s.url) || typeof(s.data) === "string" && jsre.test(s.data) ) ) {
-
-		var jsonp = s.jsonp = s.jsonp || "callback",
-			jsonpCallback = s.jsonpCallback =
+		var jsonpCallback = s.jsonpCallback =
 				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
 			url = s.url.replace(jsre, "=" + jsonpCallback + "$1"),
-			data = s.url == url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
+			data = s.url === url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
 
-		if ( url == s.url && data == s.data ) {
-			url = url += (rquery_jsonp.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
+		if ( url === s.url && data === s.data ) {
+			url += (rquery_jsonp.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
 		}
 
 		s.url = url;
 		s.data = data;
+		s.dataTypes[ 0 ] = "jsonp";
 	}
 
-// Bind transport to json dataType
-}).transport("json", function(s) {
+// Bind transport to jsonp dataType
+}).transport("jsonp", function(s) {
 
-	if ( s.jsonp ) {
+	// Put callback in place
+	var responseContainer,
+		jsonpCallback = s.jsonpCallback,
+		previous = window[ jsonpCallback ];
 
-		// Put callback in place
-		var responseContainer,
-			jsonpCallback = s.jsonpCallback,
-			previous = window[ jsonpCallback ];
+	window [ jsonpCallback ] = function( response ) {
+		responseContainer = [response];
+	};
 
-		window [ jsonpCallback ] = function( response ) {
-			responseContainer = [response];
-		};
+	s.complete = [function() {
 
-		s.complete = [function() {
+		// Set callback back to previous value
+		window[ jsonpCallback ] = previous;
 
-			// Set callback back to previous value
-			window[ jsonpCallback ] = previous;
-
-			// Call if it was a function and we have a response
-			if ( previous) {
-				if ( responseContainer && jQuery.isFunction ( previous ) ) {
-					window[ jsonpCallback ] ( responseContainer[0] );
-				}
-			} else {
-				// else, more memory leak avoidance
-				try{ delete window[ jsonpCallback ]; } catch(e){}
+		// Call if it was a function and we have a response
+		if ( previous) {
+			if ( responseContainer && jQuery.isFunction ( previous ) ) {
+				window[ jsonpCallback ] ( responseContainer[0] );
 			}
+		} else {
+			// else, more memory leak avoidance
+			try{ delete window[ jsonpCallback ]; } catch(e){}
+		}
 
-		}, s.complete ];
+	}, s.complete ];
 
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( ! responseContainer ) {
-				jQuery.error( jsonpCallback + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
+	// Sneakily ensure this will be handled as json
+	s.dataTypes[ 0 ] = "json";
 
-		// Delegate to script transport
-		return "script";
-	}
+	// Use data converter to retrieve json after script execution
+	s.converters["script json"] = function() {
+		if ( ! responseContainer ) {
+			jQuery.error( jsonpCallback + " was not called" );
+		}
+		return responseContainer[ 0 ];
+	};
+
+	// Delegate to script transport
+	return "script";
 });
 
 })( jQuery );

From 8c8bd3bf6ac982f98c1b89b0af74a1fd2d07e360 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 21:48:52 +0100
Subject: [PATCH 090/110] =?UTF-8?q?Fixes=20#5812.=20=3D=3F=20will=20be=20d?=
 =?UTF-8?q?etected=20even=20when=20it=20has=20been=20escaped=20during=20da?=
 =?UTF-8?q?ta=20serialization.?=

---
 src/ajax/jsonp.js |  2 +-
 test/unit/ajax.js | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 0af00567c..f4b324e17 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-	jsre = /\=\?(&|$)/,
+	jsre = /\=(?:\?|%3F)(&|$)/i,
 	rquery_jsonp = /\?/;
 
 // Default jsonp settings
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index d849cff24..773088fc9 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1081,7 +1081,7 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(9);
+	expect(10);
 
 	var count = 0;
 	function plus(){ if ( ++count == 9 ) start(); }
@@ -1128,6 +1128,22 @@ test("jQuery.ajax() - JSONP, Local", function() {
 		}
 	});
 
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		data: {
+			callback: "?"
+		},
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, processed data callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, processed data callback)" );
+			plus();
+		}
+	});
+
 	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",

From 1d1d4fe112c49cbd704d880b27cc646f2bfe1737 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 22:20:58 +0100
Subject: [PATCH 091/110] Moved unload abort code so that the event is only
 bound if the xhr transport is used. Fixes #5280.

---
 src/ajax/xhr.js | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index a2ec4a4c5..26e91ce79 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -10,7 +10,7 @@ var // Next fake timer id
 	xhrPool = [],
 
 	// #5280: see end of file
-	xhrUnloadAbortMarker = [];
+	xhrUnloadAbortMarker;
 
 
 jQuery.ajax.transport( function( s , determineDataType ) {
@@ -24,6 +24,26 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 
 			send: function(headers, complete) {
 
+				// #5280: we need to abort on unload or IE will keep connections alive
+				if ( ! xhrUnloadAbortMarker ) {
+
+					xhrUnloadAbortMarker = [];
+
+					jQuery(window).bind( "unload" , function() {
+
+						// Abort all pending requests
+						jQuery.each(xhrs, function(_, xhr) {
+							if ( xhr.onreadystatechange ) {
+								xhr.onreadystatechange( xhrUnloadAbortMarker );
+							}
+						});
+
+						// Reset polling structure to be safe
+						xhrs = {};
+
+					});
+				}
+
 				var xhr = xhrPool.pop() || s.xhr(),
 					handle;
 
@@ -178,19 +198,4 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 	}
 });
 
-// #5280: we need to abort on unload or IE will keep connections alive
-jQuery(window).bind( "unload" , function() {
-
-	// Abort all pending requests
-	jQuery.each(xhrs, function(_, xhr) {
-		if ( xhr.onreadystatechange ) {
-			xhr.onreadystatechange( xhrUnloadAbortMarker );
-		}
-	});
-
-	// Resest polling structure to be safe
-	xhrs = {};
-
-});
-
 })( jQuery );

From 4e86766d54a71263f8e7cbf2957405e12d9b8b36 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Sun, 9 Jan 2011 16:22:11 -0600
Subject: [PATCH 092/110] Change embedded regexp to a variable (for #6876).

---
 src/ajax.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index dbea8d5d4..d570fcccb 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -11,6 +11,7 @@ var r20 = /%20/g,
 	rselectTextarea = /^(?:select|textarea)/i,
 	rts = /([?&])_=[^&]*/,
 	rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
+	rCRLF = /\r?\n/g,
 
 	// Slice function
 	sliceFunc = Array.prototype.slice,
@@ -107,9 +108,9 @@ jQuery.fn.extend({
 				null :
 				jQuery.isArray(val) ?
 					jQuery.map( val, function(val, i){
-						return {name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
+						return { name: elem.name, value: val.replace(rCRLF, "\r\n") };
 					}) :
-					{name: elem.name, value: val.replace(/\r?\n/g, "\r\n")};
+					{ name: elem.name, value: val.replace(rCRLF, "\r\n") };
 		}).get();
 	}
 });

From fcf623786aeae20485e5253bd2b66c8758053646 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Sun, 9 Jan 2011 16:25:44 -0600
Subject: [PATCH 093/110] Ensure that the DOM element ref in an event handler
 is removed by cleanData to avoid an IE6/7/8 memory leak. Fixes #7054.

---
 src/manipulation.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/manipulation.js b/src/manipulation.js
index 96caa02d0..493082212 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -617,6 +617,11 @@ jQuery.extend({
 							jQuery.removeEvent( elem, type, data.handle );
 						}
 					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
 				}
 
 				if ( deleteExpando ) {

From 012f0c3b4bd3d04c2f3e1ea80fc1230901d607d9 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 9 Jan 2011 17:34:58 -0600
Subject: [PATCH 094/110] Revert fb4445070cd9e06929c7b6f27c10dbf42d4a3367 which
 is no longer necessary with the release of Opera 11. Fixes #7608.

---
 src/css.js | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/css.js b/src/css.js
index 8a83c6072..a6e2bb614 100644
--- a/src/css.js
+++ b/src/css.js
@@ -12,9 +12,6 @@ var ralpha = /alpha\([^)]*\)/i,
 	cssHeight = [ "Top", "Bottom" ],
 	curCSS,
 
-	getComputedStyle,
-	currentStyle,
-
 	fcamelCase = function( all, letter ) {
 		return letter.toUpperCase();
 	};
@@ -172,10 +169,6 @@ jQuery.each(["height", "width"], function( i, name ) {
 				if ( val <= 0 ) {
 					val = curCSS( elem, name, name );
 
-					if ( val === "0px" && currentStyle ) {
-						val = currentStyle( elem, name, name );
-					}
-
 					if ( val != null ) {
 						// Should return "auto" instead of 0, use 0 for
 						// temporary backwards-compat
@@ -241,7 +234,7 @@ if ( !jQuery.support.opacity ) {
 }
 
 if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, newName, name ) {
+	curCSS = function( elem, newName, name ) {
 		var ret, defaultView, computedStyle;
 
 		name = name.replace( rupper, "-$1" ).toLowerCase();
@@ -259,10 +252,8 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
 
 		return ret;
 	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
+} else if ( document.documentElement.currentStyle ) {
+	curCSS = function( elem, name ) {
 		var left, rsLeft,
 			ret = elem.currentStyle && elem.currentStyle[ name ],
 			style = elem.style;
@@ -291,8 +282,6 @@ if ( document.documentElement.currentStyle ) {
 	};
 }
 
-curCSS = getComputedStyle || currentStyle;
-
 function getWH( elem, name, extra ) {
 	var which = name === "width" ? cssWidth : cssHeight,
 		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;

From 84319aa4a32c1221110419cbe9e427dc9e184555 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Mon, 10 Jan 2011 00:52:20 +0100
Subject: [PATCH 095/110] Fixes a race condition in JSONP Local test.

---
 test/unit/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 773088fc9..9f46c4134 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1084,7 +1084,7 @@ test("jQuery.ajax() - JSONP, Local", function() {
 	expect(10);
 
 	var count = 0;
-	function plus(){ if ( ++count == 9 ) start(); }
+	function plus(){ if ( ++count == 10 ) start(); }
 
 	stop();
 

From b14f02899e74c429effadd88527ffde17650149a Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 9 Jan 2011 18:38:44 -0600
Subject: [PATCH 096/110] Ensure that buildFragment clones elements properly in
 all browsers. Fixes #3879, #6655. Also improves form element clone tests and
 fixes bugs in $.fn.clone exposed by these new test cases related to the
 values of checkboxes and radio buttons in IE.

---
 src/core.js               |  2 +-
 src/manipulation.js       | 22 ++++++++++++++++++----
 test/unit/core.js         |  7 ++++++-
 test/unit/manipulation.js | 32 +++++++++++++++++++++++---------
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/core.js b/src/core.js
index b9e6d816f..4361577e2 100644
--- a/src/core.js
+++ b/src/core.js
@@ -129,7 +129,7 @@ jQuery.fn = jQuery.prototype = {
 
 					} else {
 						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+						selector = (ret.cacheable ? jQuery(ret.fragment).clone()[0] : ret.fragment).childNodes;
 					}
 
 					return jQuery.merge( this, selector );
diff --git a/src/manipulation.js b/src/manipulation.js
index 493082212..cf533c818 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -420,15 +420,29 @@ function cloneFixAttributes(src, dest) {
 	if ( nodeName === "object" ) {
 		dest.outerHTML = src.outerHTML;
 
-	// IE6-8 fails to persist the checked state of a cloned checkbox
-	// or radio button
-	} else if ( nodeName === "input" && src.checked ) {
-		dest.defaultChecked = dest.checked = src.checked;
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
 
 	// IE6-8 fails to return the selected option to the default selected
 	// state when cloning options
 	} else if ( nodeName === "option" ) {
 		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
 	}
 
 	// Event data gets referenced instead of copied if the expando
diff --git a/test/unit/core.js b/test/unit/core.js
index 8fd060578..bfb2f1cf4 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,7 +12,7 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(23);
+	expect(24);
 
 	// Basic constructor's behavior
 
@@ -84,6 +84,11 @@ test("jQuery()", function() {
 
 	exec = true;
 	elem.click();
+
+	for ( var i = 0; i < 3; ++i ) {
+		elem = jQuery("<input type='text' value='TEST' />");
+	}
+	equals( elem[0].defaultValue, "TEST", "Ensure cached nodes are cloned properly (Bug #6655)" );
 });
 
 test("selector state", function() {
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index e273cf08a..559a076fa 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -395,7 +395,7 @@ test("append(Function) with incoming value", function() {
 });
 
 test("append the same fragment with events (Bug #6997, 5566)", function () {
-	expect(4 + (document.fireEvent ? 1 : 0));
+	expect(2 + (document.fireEvent ? 1 : 0));
 	stop(1000);
 
 	var element;
@@ -426,14 +426,6 @@ test("append the same fragment with events (Bug #6997, 5566)", function () {
 
 	jQuery("#listWithTabIndex li").before(element);
 	jQuery("#listWithTabIndex li.test6997").eq(1).click();
-
-	element = jQuery("<select><option>Foo</option><option selected>Bar</option></select>");
-
-	equals( element.clone().find("option:selected").val(), element.find("option:selected").val(), "Selected option cloned correctly" );
-
-	element = jQuery("<input type='checkbox'>").attr('checked', 'checked');
-
-	equals( element.clone().is(":checked"), element.is(":checked"), "Checked input cloned correctly" );
 });
 
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -945,6 +937,28 @@ test("clone()", function() {
 	equal( jQuery("body").clone().children()[0].id, "qunit-header", "Make sure cloning body works" );
 });
 
+test("clone(form element) (Bug #3879, #6655)", function() {
+	expect(6);
+	element = jQuery("<select><option>Foo</option><option selected>Bar</option></select>");
+
+	equals( element.clone().find("option:selected").val(), element.find("option:selected").val(), "Selected option cloned correctly" );
+
+	element = jQuery("<input type='checkbox' value='foo'>").attr('checked', 'checked');
+	clone = element.clone();
+
+	equals( clone.is(":checked"), element.is(":checked"), "Checked input cloned correctly" );
+	equals( clone[0].defaultValue, "foo", "Checked input defaultValue cloned correctly" );
+	equals( clone[0].defaultChecked, !jQuery.support.noCloneEvent, "Checked input defaultChecked cloned correctly" );
+
+	element = jQuery("<input type='text' value='foo'>");
+	clone = element.clone();
+	equals( clone[0].defaultValue, "foo", "Text input defaultValue cloned correctly" );
+
+	element = jQuery("<textarea>foo</textarea>");
+	clone = element.clone();
+	equals( clone[0].defaultValue, "foo", "Textarea defaultValue cloned correctly" );
+});
+
 if (!isLocal) {
 test("clone() on XML nodes", function() {
 	expect(2);

From 5a721cf31b142365954a2d71e860534da4536b16 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 11 Jan 2011 20:02:33 +0100
Subject: [PATCH 097/110] Fixes 4825. jQuery.fn.load: use the jXHR's Promise
 interface to get the actual response in case ajaxSettings contains a
 dataFilter. Unit test added.

---
 src/ajax.js       | 18 +++++++++++++-----
 test/unit/ajax.js | 12 ++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index d570fcccb..82c499b64 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -61,26 +61,34 @@ jQuery.fn.extend({
 			type: type,
 			dataType: "html",
 			data: params,
-			complete: function( res, status ) {
+			// Complete callback (responseText is used internally)
+			complete: function( jXHR, status, responseText ) {
+				// Store the response as specified by the jXHR object
+				responseText = jXHR.responseText;
 				// If successful, inject the HTML into all the matched elements
-				if ( status === "success" || status === "notmodified" ) {
+				if ( jXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jXHR.done(function( r ) {
+						responseText = r;
+					});
 					// 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(rscript, ""))
+							.append(responseText.replace(rscript, ""))
 
 							// Locate the specified elements
 							.find(selector) :
 
 						// If not, just inject the full result
-						res.responseText );
+						responseText );
 				}
 
 				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
+					self.each( callback, [responseText, status, jXHR] );
 				}
 			}
 		});
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 9f46c4134..1b5540216 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1025,6 +1025,18 @@ test("load(String, Function) - check file with only a script tag", function() {
 	});
 });
 
+test("load(String, Function) - dataFilter in ajaxSettings", function() {
+	expect(2);
+	stop();
+	jQuery.ajaxSetup({ dataFilter: function() { return "Hello World"; } });
+	var div = jQuery("<div/>").load(url("data/name.html"), function(responseText) {
+		strictEqual( div.html(), "Hello World" , "Test div was filled with filtered data" );
+		strictEqual( responseText, "Hello World" , "Test callback receives filtered data" );
+		jQuery.ajaxSetup({ dataFilter: 0 });
+		start();
+	});
+});
+
 test("load(String, Object, Function)", function() {
 	expect(2);
 	stop();

From 6504d4f7005c99ea4064068f3d712322a064b97a Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 11 Jan 2011 23:01:18 +0100
Subject: [PATCH 098/110] Fixes #6230. Added a unit test to control that, since
 the ajax rewrite, setting the Accept header actually replaced the previous
 value and didn't append to it (tested in Safari 4.0.4 for which the problem
 was specifically reported).

---
 test/unit/ajax.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 1b5540216..c7803f857 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -316,6 +316,28 @@ test(".ajax() - headers" , function() {
 
 });
 
+test(".ajax() - Accept header" , function() {
+
+	expect( 1 );
+
+	stop();
+
+	jQuery.ajax(url("data/headers.php?keys=accept"), {
+		headers: {
+			Accept: "very wrong accept value"
+		},
+		beforeSend: function( xhr ) {
+			xhr.setRequestHeader( "Accept", "*/*" );
+		},
+		success: function( data ) {
+			strictEqual( data , "accept: */*\n" , "Test Accept header is set to last value provided" );
+			start();
+		},
+		error: function(){ ok(false, "error"); }
+	});
+
+});
+
 test(".ajax() - contentType" , function() {
 
 	expect( 2 );

From f83cdc3c4c134b2796335e9f9806f3b67e7ca87f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 11 Jan 2011 23:43:02 +0100
Subject: [PATCH 099/110] Yet another missing semicolon!

---
 test/unit/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c7803f857..4162d585a 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -276,7 +276,7 @@ test(".ajax() - retry with jQuery.ajax( this )", function() {
 				start();
 			}
 		}
-	})
+	});
 
 });
 

From 0c51e9d55f39366cab14719b80cb7e989c716351 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 12 Jan 2011 18:36:00 +0100
Subject: [PATCH 100/110] Fixes #4897. Added ?? as a context-insensitive
 placeholder for the callback name of a JSONP request. Unit tests provided.

---
 src/ajax/jsonp.js   |  6 ++---
 test/data/jsonp.php |  4 ++++
 test/unit/ajax.js   | 57 +++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index f4b324e17..dd04b34b0 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-	jsre = /\=(?:\?|%3F)(&|$)/i,
+	jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i,
 	rquery_jsonp = /\?/;
 
 // Default jsonp settings
@@ -25,8 +25,8 @@ jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
 
 		var jsonpCallback = s.jsonpCallback =
 				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-			url = s.url.replace(jsre, "=" + jsonpCallback + "$1"),
-			data = s.url === url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
+			url = s.url.replace(jsre, "$1" + jsonpCallback + "$2"),
+			data = s.url === url && typeof(s.data) === "string" ? s.data.replace(jsre, "$1" + jsonpCallback + "$2") : s.data;
 
 		if ( url === s.url && data === s.data ) {
 			url += (rquery_jsonp.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
diff --git a/test/data/jsonp.php b/test/data/jsonp.php
index 9ae1d8487..6c13d72e9 100644
--- a/test/data/jsonp.php
+++ b/test/data/jsonp.php
@@ -1,6 +1,10 @@
 <?php
 error_reporting(0);
 $callback = $_REQUEST['callback'];
+if ( ! $callback ) {
+	$callback = explode("?",end(explode("/",$_SERVER['REQUEST_URI'])));
+	$callback = $callback[0];
+}
 $json = $_REQUEST['json'];
 if($json) {
 	echo $callback . '([ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ])';
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4162d585a..10c2e7183 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1115,10 +1115,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(10);
+	expect(14);
 
 	var count = 0;
-	function plus(){ if ( ++count == 10 ) start(); }
+	function plus(){ if ( ++count == 14 ) start(); }
 
 	stop();
 
@@ -1162,6 +1162,59 @@ test("jQuery.ajax() - JSONP, Local", function() {
 		}
 	});
 
+	jQuery.ajax({
+		url: "data/jsonp.php?callback=??",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, url context-free callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, url context-free callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		data: "callback=??",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data context-free callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data context-free callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php/??",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, REST-like)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, REST-like)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php/???json=1",
+		dataType: "jsonp",
+		success: function(data){
+			strictEqual( jQuery.type(data), "array", "JSON results returned (GET, REST-like with param)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, REST-like with param)" );
+			plus();
+		}
+	});
+
 	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",

From 14b07ec5de0437278806d12d058a249940eb531b Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 12 Jan 2011 18:53:00 +0100
Subject: [PATCH 101/110] AjaxSetup now uses deep extend internally to
 accomodate map structured options.

---
 src/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ajax.js b/src/ajax.js
index 82c499b64..968c67c8a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -160,7 +160,7 @@ jQuery.extend({
 	},
 
 	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
+		jQuery.extend( true, jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {

From e221d39e981ceac030d2e0431570742fb51337d5 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 12 Jan 2011 18:54:15 +0100
Subject: [PATCH 102/110] Script transport now uses ajaxSetup to define script
 dataType.

---
 src/ajax/script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ajax/script.js b/src/ajax/script.js
index 0db0de6c7..75f34fce2 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
-// Install text to script executor
-jQuery.extend( true, jQuery.ajaxSettings , {
+// Install script dataType
+jQuery.ajaxSetup({
 
 	accepts: {
 		script: "text/javascript, application/javascript"
@@ -14,7 +14,7 @@ jQuery.extend( true, jQuery.ajaxSettings , {
 	converters: {
 		"text script": jQuery.globalEval
 	}
-} );
+});
 
 // Bind script tag hack transport
 jQuery.ajax.transport("script", function(s) {

From e9fb7d5be6e079aaa2cf0c3092c6f15cd1285bf4 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 00:41:10 +0100
Subject: [PATCH 103/110] Gets rid of a var statement by moving variable
 declarations up.

---
 src/ajax.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 968c67c8a..a2b934d75 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -274,6 +274,9 @@ jQuery.extend({
 			transport,
 			// timeout handle
 			timeoutTimer,
+			// Cross-domain detection vars
+			loc = document.location,
+			parts,
 			// The jXHR state
 			state = 0,
 			// Loop variable
@@ -527,10 +530,8 @@ jQuery.extend({
 		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
 
 		// Determine if a cross-domain request is in order
-		var parts = rurl.exec( s.url.toLowerCase() ),
-			loc = location;
-
 		if ( ! s.crossDomain ) {
+			parts = rurl.exec( s.url.toLowerCase() );
 			s.crossDomain = !!(
 					parts &&
 					( parts[ 1 ] && parts[ 1 ] != loc.protocol ||

From ed1144816b07fbb2ea94217fd967626619344ad9 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 00:49:58 +0100
Subject: [PATCH 104/110] Fixes a regression by calling dataFilter with the
 second argument set as the dataType.

---
 src/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ajax.js b/src/ajax.js
index a2b934d75..2c658b1e4 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -456,7 +456,7 @@ jQuery.extend({
 								}
 							} else if ( s.dataFilter ) {
 
-								response = s.dataFilter( response );
+								response = s.dataFilter( response , current );
 								dataTypes = s.dataTypes;
 							}
 						}

From 97b244312e5dba9b28129006c9407ca80bb6c99b Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 01:18:46 +0100
Subject: [PATCH 105/110] Removes unnecessary variables and adds much needed
 comments into the data conversion logic in ajax.

---
 src/ajax.js | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 2c658b1e4..c307ba50d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -402,64 +402,86 @@ jQuery.extend({
 					try {
 
 						var i,
+							// Current dataType
 							current,
+							// Previous dataType
 							prev,
-							checker,
+							// Conversion function
 							conv,
+							// Conversion functions (when text is used in-between)
 							conv1,
 							conv2,
-							convertion,
+							// Local references to dataTypes & converters
 							dataTypes = s.dataTypes,
 							converters = s.converters,
+							// DataType to responseXXX field mapping
 							responses = {
 								"xml": "XML",
 								"text": "Text"
 							};
 
+						// For each dataType in the chain
 						for( i = 0 ; i < dataTypes.length ; i++ ) {
 
 							current = dataTypes[ i ];
 
+							// If a responseXXX field for this dataType exists
+							// and if it hasn't been set yet
 							if ( responses[ current ] ) {
+								// Set it
 								jXHR[ "response" + responses[ current ] ] = response;
+								// Mark it as set
 								responses[ current ] = 0;
 							}
 
+							// If this is not the first element
 							if ( i ) {
 
+								// Get the dataType to convert from
 								prev = dataTypes[ i - 1 ];
 
+								// If no catch-all and dataTypes are actually different
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 
-									conv = converters[ ( conversion = prev + " " + current ) ] ||
+									// Get the converter
+									conv = converters[ prev + " " + current ] ||
 										converters[ "* " + current ];
 
 									conv1 = conv2 = 0;
 
+									// If there is no direct converter and none of the dataTypes is text
 									if ( ! conv && prev !== "text" && current !== "text" ) {
+										// Try with text in-between
 										conv1 = converters[ prev + " text" ] || converters[ "* text" ];
 										conv2 = converters[ "text " + current ];
+										// Revert back to a single converter
+										// if one of the converter is an equivalence
 										if ( conv1 === true ) {
 											conv = conv2;
 										} else if ( conv2 === true ) {
 											conv = conv1;
 										}
 									}
-
+									// If we found no converter, dispatch an error
 									if ( ! ( conv || conv1 && conv2 ) ) {
 										throw conversion;
 									}
-
+									// If found converter is not an equivalence
 									if ( conv !== true ) {
+										// Convert with 1 or 2 converters accordingly
 										response = conv ? conv( response ) : conv2( conv1( response ) );
 									}
 								}
+							// If it is the first element of the chain
+							// and we have a dataFilter
 							} else if ( s.dataFilter ) {
-
+								// Apply the dataFilter
 								response = s.dataFilter( response , current );
+								// Get dataTypes again in case the filter changed them
 								dataTypes = s.dataTypes;
 							}
 						}
+						// End of loop
 
 						// We have a real success
 						success = response;

From b07d43c649240a78f5e832e2825db3af87357932 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 01:43:42 +0100
Subject: [PATCH 106/110] Cleans up statusText handling and simplifies 304
 notmodified logic.

---
 src/ajax.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index c307ba50d..c2dc3e404 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -365,17 +365,10 @@ jQuery.extend({
 				// Stored success
 				success,
 				// Stored error
-				error = statusText;
-
-			// If not timeout, force a jQuery-compliant status text
-			if ( statusText != "timeout" ) {
-				statusText = ( status >= 200 && status < 300 ) ?
-					"success" :
-					( status === 304 ? "notmodified" : "error" );
-			}
+				error;
 
 			// If successful, handle type chaining
-			if ( statusText === "success" || statusText === "notmodified" ) {
+			if ( status >= 200 && status < 300 || status === 304 ) {
 
 				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
 				if ( s.ifModified ) {
@@ -391,12 +384,20 @@ jQuery.extend({
 					}
 				}
 
-				if ( s.ifModified && statusText === "notmodified" ) {
+				// If not modified
+				if ( status === 304 ) {
 
-					success = null;
+					// Set the statusText accordingly
+					statusText = "notmodified";
+					// Mark as a success
 					isSuccess = 1;
 
+				// If we have data
 				} else {
+
+					// Set the statusText accordingly
+					statusText = "success";
+
 					// Chain data conversions and determine the final value
 					// (if an exception is thrown in the process, it'll be notified as an error)
 					try {
@@ -487,17 +488,20 @@ jQuery.extend({
 						success = response;
 						isSuccess = 1;
 
+					// If an exception was thrown
 					} catch(e) {
 
+						// We have a parsererror
 						statusText = "parsererror";
 						error = "" + e;
 
 					}
 				}
 
-			} else { // if not success, mark it as an error
+			// if not success, mark it as an error
+			} else {
 
-					error = error || statusText;
+					error = statusText = statusText || "error";
 
 					// Set responseText if needed
 					if ( response ) {

From 667a3b31e6a27cfe3f209765d583bff584ecc2f6 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 02:05:39 +0100
Subject: [PATCH 107/110] Reworked script and xhr abort logic to take advantage
 of the fact jXHR.abort will complete the request itself if not done already.

---
 src/ajax/script.js | 13 ++++++----
 src/ajax/xhr.js    | 65 ++++++++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/src/ajax/script.js b/src/ajax/script.js
index 75f34fce2..645ddf335 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -47,7 +47,7 @@ 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 ) ) {
 
@@ -59,10 +59,13 @@ jQuery.ajax.transport("script", function(s) {
 							head.removeChild( script );
 						}
 
+						// Dereference the script
 						script = 0;
 
-						// 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,9 +73,9 @@ 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);
 				}
 			}
 		};
diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 26e91ce79..3c3d12493 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -9,8 +9,8 @@ var // Next fake timer id
 	// XHR pool
 	xhrPool = [],
 
-	// #5280: see end of file
-	xhrUnloadAbortMarker;
+	// #5280: see below
+	xhrUnloadAbortInstalled;
 
 
 jQuery.ajax.transport( function( s , determineDataType ) {
@@ -25,25 +25,23 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 			send: function(headers, complete) {
 
 				// #5280: we need to abort on unload or IE will keep connections alive
-				if ( ! xhrUnloadAbortMarker ) {
+				if ( ! xhrUnloadAbortInstalled ) {
 
-					xhrUnloadAbortMarker = [];
+					xhrUnloadAbortInstalled = 1;
 
 					jQuery(window).bind( "unload" , function() {
 
 						// Abort all pending requests
 						jQuery.each(xhrs, function(_, xhr) {
 							if ( xhr.onreadystatechange ) {
-								xhr.onreadystatechange( xhrUnloadAbortMarker );
+								xhr.onreadystatechange( 1 );
 							}
 						});
 
-						// Reset polling structure to be safe
-						xhrs = {};
-
 					});
 				}
 
+				// Get a new xhr
 				var xhr = xhrPool.pop() || s.xhr(),
 					handle;
 
@@ -58,7 +56,7 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				// Requested-With header
 				// Not set for crossDomain requests with no content
 				// (see why at http://trac.dojotoolkit.org/ticket/9486)
-				// Won't change header if already provided in beforeSend
+				// Won't change header if already provided
 				if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) {
 					headers["x-requested-with"] = "XMLHttpRequest";
 				}
@@ -76,20 +74,23 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				try {
 					xhr.send( ( s.hasContent && s.data ) || null );
 				} catch(e) {
-					// Store back in pool
+					// Store back into pool
 					xhrPool.push( xhr );
 					complete(0, "error", "" + e);
 					return;
 				}
 
 				// Listener
-				callback = function ( abortStatusText ) {
+				callback = function( isAbort ) {
 
 					// Was never called and is aborted or complete
-					if ( callback && ( abortStatusText || xhr.readyState === 4 ) ) {
+					if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
 
-						// Do not listen anymore
-						// and Store back in pool
+						// Only called once
+						callback = 0;
+
+						// Do not keep as active anymore
+						// and store back into pool
 						if (handle) {
 							xhr.onreadystatechange = jQuery.noop;
 							delete xhrs[ handle ];
@@ -97,28 +98,20 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 							xhrPool.push( xhr );
 						}
 
-						callback = 0;
-
-						// Get info
-						var status, statusText, response, responseHeaders;
-
-						if ( abortStatusText ) {
+						// If it's an abort
+						if ( isAbort ) {
 
+							// Abort it manually if needed
 							if ( xhr.readyState !== 4 ) {
 								xhr.abort();
 							}
-
-							// Stop here if unloadAbort
-							if ( abortStatusText === xhrUnloadAbortMarker ) {
-								return;
-							}
-
-							status = 0;
-							statusText = abortStatusText;
-
 						} else {
 
-							status = xhr.status;
+							// Get info
+							var status = xhr.status,
+								statusText,
+								response,
+								responseHeaders = xhr.getAllResponseHeaders();
 
 							try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests
 
@@ -130,8 +123,6 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 
 							}
 
-							responseHeaders = xhr.getAllResponseHeaders();
-
 							// Filter status for non standard behaviours
 							// (so many they seem to be the actual "standard")
 							status =
@@ -164,10 +155,10 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 									xhr.getResponseHeader("content-type"),
 									xhr.responseText,
 									xhr.responseXML );
-						}
 
-						// Call complete
-						complete(status,statusText,response,responseHeaders);
+							// Call complete
+							complete(status,statusText,response,responseHeaders);
+						}
 					}
 				};
 
@@ -189,9 +180,9 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				}
 			},
 
-			abort: function(statusText) {
+			abort: function() {
 				if ( callback ) {
-					callback(statusText);
+					callback(1);
 				}
 			}
 		};

From 57956152d8a9d23ae97ba576b8ec4b63306c8758 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 16:58:16 +0100
Subject: [PATCH 108/110] Removed xhr pooling since failing cross-domain
 requests leaves the xhr object in an undefined state in Firefox. Also rewrote
 comments related to the active xhr list so that they make sense.

---
 src/ajax/xhr.js | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 3c3d12493..614bd3a0c 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -1,14 +1,11 @@
 (function( jQuery ) {
 
-var // Next fake timer id
-	xhrPollingId = jQuery.now(),
+var // Next active xhr id
+	xhrId = jQuery.now(),
 
-	// Callbacks hashtable
+	// active xhrs
 	xhrs = {},
 
-	// XHR pool
-	xhrPool = [],
-
 	// #5280: see below
 	xhrUnloadAbortInstalled;
 
@@ -42,7 +39,7 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				}
 
 				// Get a new xhr
-				var xhr = xhrPool.pop() || s.xhr(),
+				var xhr = s.xhr(),
 					handle;
 
 				// Open the socket
@@ -74,14 +71,12 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 				try {
 					xhr.send( ( s.hasContent && s.data ) || null );
 				} catch(e) {
-					// Store back into pool
-					xhrPool.push( xhr );
 					complete(0, "error", "" + e);
 					return;
 				}
 
 				// Listener
-				callback = function( isAbort ) {
+				callback = function( _ , isAbort ) {
 
 					// Was never called and is aborted or complete
 					if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
@@ -94,8 +89,6 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 						if (handle) {
 							xhr.onreadystatechange = jQuery.noop;
 							delete xhrs[ handle ];
-							handle = undefined;
-							xhrPool.push( xhr );
 						}
 
 						// If it's an abort
@@ -171,18 +164,16 @@ jQuery.ajax.transport( function( s , determineDataType ) {
 
 				} else {
 
-					// Listener is externalized to handle abort on unload
-					handle = xhrPollingId++;
+					// Add to list of active xhrs
+					handle = xhrId++;
 					xhrs[ handle ] = xhr;
-					xhr.onreadystatechange = function() {
-						callback();
-					};
+					xhr.onreadystatechange = callback;
 				}
 			},
 
 			abort: function() {
 				if ( callback ) {
-					callback(1);
+					callback(0,1);
 				}
 			}
 		};

From 44fc87f66ca54278e37f15885a80c2407036df57 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 17:01:25 +0100
Subject: [PATCH 109/110] Fixes #4964. Adds a statusCode object together with a
 new statusCode method on the jXHR object (deferred behaviour). They accept a
 map of statusCode/callback(s). Callbacks are fired when the status code of
 the response correponds to the key (as a success or an error callback
 depending on how the request completed). Unit tests added.

---
 src/ajax.js       | 27 ++++++++++++++++++
 test/unit/ajax.js | 70 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/src/ajax.js b/src/ajax.js
index c2dc3e404..a2ef4397b 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -265,6 +265,8 @@ jQuery.extend({
 			// Deferreds
 			deferred = jQuery.Deferred(),
 			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
 			// Headers (they are sent all at once)
 			requestHeaders = {},
 			// Response headers
@@ -520,6 +522,9 @@ jQuery.extend({
 				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
 			}
 
+			// Status-dependent callbacks
+			jXHR.statusCode( statusCode );
+
 			if ( s.global ) {
 				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
 						[ jXHR , s , isSuccess ? success : error ] );
@@ -543,6 +548,28 @@ jQuery.extend({
 		jXHR.error = jXHR.fail;
 		jXHR.complete = completeDeferred.done;
 
+		// Status-dependent callbacks
+		jXHR.statusCode = function( map ) {
+			if ( map ) {
+				var resolved = jXHR.isResolved(),
+					tmp;
+				if ( resolved || jXHR.isRejected() ) {
+					tmp = map[ jXHR.status ];
+					if ( tmp ) {
+						if ( map === statusCode ) {
+							delete statusCode[ jXHR.status ];
+						}
+						jXHR[ resolved ? "done" : "fail" ]( tmp );
+					}
+				} else {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ];
+					}
+				}
+			}
+			return this;
+		};
+
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
 
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 10c2e7183..f5b71da39 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1915,6 +1915,76 @@ test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
 	ok( success, "document.location did not generate exception" );
 });
 
+test( "jQuery.ajax - statusCode" , function() {
+
+	var count = 10;
+
+	expect( 16 );
+	stop();
+
+	function countComplete() {
+		if ( ! --count ) {
+			start();
+		}
+	}
+
+	function createStatusCodes( name , isSuccess ) {
+		name = "Test " + name + " " + ( isSuccess ? "success" : "error" );
+		return {
+			200: function() {
+				ok( isSuccess , name );
+			},
+			404: function() {
+				ok( ! isSuccess , name );
+			}
+		}
+	}
+
+	jQuery.each( {
+		"data/name.html": true,
+		"data/someFileThatDoesNotExist.html": false
+	} , function( uri , isSuccess ) {
+
+		jQuery.ajax( url( uri ) , {
+			statusCode: createStatusCodes( "in options" , isSuccess ),
+			complete: countComplete
+		});
+
+		jQuery.ajax( url( uri ) , {
+			complete: countComplete
+		}).statusCode( createStatusCodes( "immediately with method" , isSuccess ) );
+
+		jQuery.ajax( url( uri ) , {
+			complete: function(jXHR) {
+				jXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
+				countComplete();
+			}
+		});
+
+		jQuery.ajax( url( uri ) , {
+			complete: function(jXHR) {
+				setTimeout( function() {
+					jXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
+					countComplete();
+				} , 100 );
+			}
+		});
+
+		jQuery.ajax( url( uri ) , {
+			statusCode: createStatusCodes( "all (options)" , isSuccess ),
+			complete: function(jXHR) {
+				jXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
+				setTimeout( function() {
+					jXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
+					countComplete();
+				} , 100 );
+			}
+		}).statusCode( createStatusCodes( "all (immediately with method)" , isSuccess ) );
+
+	});
+
+});
+
 }
 
 //}
\ No newline at end of file

From a8fa5f2ec1030bceb9a65d0237f0c92ae4e014dd Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 18:33:24 +0100
Subject: [PATCH 110/110] Moved jQuery.ajax.prefilter and jQuery.ajax.transport
 to jQuery.ajaxPrefilter and jQuery.ajaxTransport so that proxying the ajax
 method doesn't turn into a nightmare. Thanks go to scott_gonzalez and
 DaveMethvin for pointing out the issue. Also made ajaxSetup return "this" to
 enable chainable definitions --
 jQuery.ajaxSetup(...).ajaxPrefilter(...).ajaxTransport(...).

---
 src/ajax.js        | 13 +++++++------
 src/ajax/jsonp.js  |  5 ++---
 src/ajax/script.js |  3 +--
 src/ajax/xhr.js    |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index a2ef4397b..645163ad2 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -161,6 +161,7 @@ jQuery.extend({
 
 	ajaxSetup: function( settings ) {
 		jQuery.extend( true, jQuery.ajaxSettings, settings );
+		return this;
 	},
 
 	ajaxSettings: {
@@ -599,7 +600,7 @@ jQuery.extend({
 		}
 
 		// Get transport
-		transport = jQuery.ajax.prefilter( s , options ).transport( s );
+		transport = jQuery.ajaxPrefilter( s , options ).ajaxTransport( s );
 
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
@@ -849,7 +850,7 @@ function ajax_selectOrExecute( structure , s ) {
 		}
 	}
 
-	return noSelect ? jQuery.ajax : selected;
+	return noSelect ? jQuery : selected;
 }
 
 // Add an element to one of the structures in ajaxSettings
@@ -908,13 +909,13 @@ function ajax_addElement( structure , args ) {
 		}
 	}
 
-	return jQuery.ajax;
+	return jQuery;
 }
 
 // Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-	_ = name + "s";
-	jQuery.ajax[ name ] = function() {
+jQuery.each( [ "Prefilter" , "Transport" ] , function( _ , name ) {
+	_ = name.toLowerCase() + "s";
+	jQuery[ "ajax" + name ] = function() {
 		return ajax_addElement( _ , arguments );
 	};
 } );
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index dd04b34b0..1df5dd427 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -10,12 +10,11 @@ jQuery.ajaxSetup({
 	jsonpCallback: function() {
 		return "jsonp" + jsc++;
 	}
-});
 
 // Normalize jsonp queries
 // 1) put callback parameter in url or data
 // 2) sneakily ensure transportDataType is always jsonp for jsonp requests
-jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
+}).ajaxPrefilter("json jsonp", function(s, originalSettings) {
 
 	if ( s.dataTypes[ 0 ] === "jsonp" ||
 		originalSettings.jsonp ||
@@ -38,7 +37,7 @@ jQuery.ajax.prefilter("json jsonp", function(s, originalSettings) {
 	}
 
 // Bind transport to jsonp dataType
-}).transport("jsonp", function(s) {
+}).ajaxTransport("jsonp", function(s) {
 
 	// Put callback in place
 	var responseContainer,
diff --git a/src/ajax/script.js b/src/ajax/script.js
index 645ddf335..8e2e89ac5 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -14,10 +14,9 @@ jQuery.ajaxSetup({
 	converters: {
 		"text script": jQuery.globalEval
 	}
-});
 
 // Bind script tag hack transport
-jQuery.ajax.transport("script", function(s) {
+}).ajaxTransport("script", function(s) {
 
 	// Handle cache special case
 	if ( s.cache === undefined ) {
diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 614bd3a0c..34aa832fe 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -10,7 +10,7 @@ var // Next active xhr id
 	xhrUnloadAbortInstalled;
 
 
-jQuery.ajax.transport( function( s , determineDataType ) {
+jQuery.ajaxTransport( function( s , determineDataType ) {
 
 	// Cross domain only allowed if supported through XMLHttpRequest
 	if ( ! s.crossDomain || jQuery.support.cors ) {