From 118c8c4600b62d6de2b0248ae27626da74dcf5b2 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Tue, 9 Nov 2010 18:06:33 -0500
Subject: Fixes #7397; 4 supporting unit tests

---
 test/unit/effects.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'test')

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 74b336f1f..aca926384 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -130,6 +130,41 @@ test("show(Number) - other displays", function() {
 	});
 });
 
+
+
+//  Supports #7397
+test("Persist correct display value", function() {
+  expect(4);
+	QUnit.reset();
+	stop();
+
+	// #show-tests * is set display: none in CSS
+	jQuery("#main").append('<div id="show-tests"><span style="position:absolute;"></span></div>');
+  
+	var $span = jQuery("#show-tests span"),  
+	  orig = $span.css("display"),
+		num = 0;
+		
+  equal(orig, "none", "Expecting to start at display: none");
+
+  $span.text('Saving...').fadeIn(100, function() {
+
+    equal($span.css("display"), "block", "Expecting display: block");
+
+    $span.text('Saved!').fadeOut(100, function () {
+  
+      equal($span.css("display"), "none", "Expecting display: none");
+      
+      $span.text('Saving...').fadeIn(100, function() {
+      
+        equal($span.css("display"), "block", "Expecting display: block");
+      
+        start();
+      });
+    });
+  });
+});
+
 test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();
-- 
cgit v1.2.3


From 2a23650a19ed4db2d031697638bdd71c06f44492 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 10 Nov 2010 10:23:48 -0500
Subject: Updating #7397 unit tests to correctly test for a persisted display
 value

---
 test/unit/effects.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/unit/effects.js b/test/unit/effects.js
index aca926384..969079683 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -134,30 +134,34 @@ test("show(Number) - other displays", function() {
 
 //  Supports #7397
 test("Persist correct display value", function() {
-  expect(4);
+  expect(3);
 	QUnit.reset();
 	stop();
 
 	// #show-tests * is set display: none in CSS
-	jQuery("#main").append('<div id="show-tests"><span style="position:absolute;"></span></div>');
+	jQuery("#main").append('<div id="show-tests"><span style="position:absolute;">foo</span></div>');
   
 	var $span = jQuery("#show-tests span"),  
-	  orig = $span.css("display"),
-		num = 0;
+	  displayNone = $span.css("display"),
+	  display = '', num = 0;
 		
-  equal(orig, "none", "Expecting to start at display: none");
+  $span.show();
+  
+  display = $span.css("display");
+  
+  $span.hide();
 
-  $span.text('Saving...').fadeIn(100, function() {
+  $span.fadeIn(100, function() {
 
-    equal($span.css("display"), "block", "Expecting display: block");
+    equals($span.css("display"), display, "Expecting display: " + display);
 
-    $span.text('Saved!').fadeOut(100, function () {
+    $span.fadeOut(100, function () {
   
-      equal($span.css("display"), "none", "Expecting display: none");
+      equals($span.css("display"), displayNone, "Expecting display: " + displayNone);
       
-      $span.text('Saving...').fadeIn(100, function() {
+      $span.fadeIn(100, function() {
       
-        equal($span.css("display"), "block", "Expecting display: block");
+        equals($span.css("display"), display, "Expecting display: " + display);
       
         start();
       });
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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/";
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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; }); };
 
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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/";
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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" );
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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() {
-- 
cgit v1.2.3


From 0b6afcedd22aaffb96d3d45b9b220a16229e2f7c Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Thu, 23 Dec 2010 16:21:14 -0500
Subject: 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 | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

(limited to 'test')

diff --git a/src/event.js b/src/event.js
index fd470e718..80e2af66b 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===true ? true :
+			 src.getPreventDefault ? src.getPreventDefault() :
+			 src.returnValue===false) ? returnTrue : returnFalse;
 	// Event type
 	} else {
 		this.type = src;
diff --git a/test/unit/event.js b/test/unit/event.js
index a647e5f3b..d0183f89d 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -295,6 +295,44 @@ test("live/delegate immediate propagation", function() {
 	$p.undelegate( "click" );
 });
 
+test("bind/delegate bubbling, isDefaultPrevented", function() {
+	expect(2);
+	var $anchor2 = jQuery( "#anchor2" ),
+		$main = jQuery( "#main" ),
+		fakeClick = function($jq) {
+			// Prefer a native click so we don't get jQuery simulated bubbling
+			if ( $jq[0].click ) {
+				$jq[0].click();	// IE
+			}
+			else if ( document.createEvent ) {
+				var e = document.createEvent( 'MouseEvents' );
+				e.initEvent( "click", true, true ); 
+				$jq[0].dispatchEvent(e);
+			}
+			else {
+				$jq.click();
+			}
+		};
+	$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();
-- 
cgit v1.2.3


From b8931f744859e598aad52140d8ca085e013ac798 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Mon, 27 Dec 2010 12:43:48 -0500
Subject: Test for standard createEvent before IE-specific click method. Don't
 fallback to fake click; let's see which browsers fail, if any.

---
 test/unit/event.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/unit/event.js b/test/unit/event.js
index d0183f89d..56bc64ff6 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -300,17 +300,14 @@ test("bind/delegate bubbling, isDefaultPrevented", function() {
 	var $anchor2 = jQuery( "#anchor2" ),
 		$main = jQuery( "#main" ),
 		fakeClick = function($jq) {
-			// Prefer a native click so we don't get jQuery simulated bubbling
-			if ( $jq[0].click ) {
-				$jq[0].click();	// IE
-			}
-			else if ( document.createEvent ) {
+			// 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 {
-				$jq.click();
+			else if ( $jq[0].click ) {
+				$jq[0].click();	// IE
 			}
 		};
 	$anchor2.click(function(e) {
-- 
cgit v1.2.3


From 6ffa730721a8ebcd128f3dc202706e46d9cfe249 Mon Sep 17 00:00:00 2001
From: jrburke <jrburke@gmail.com>
Date: Mon, 27 Dec 2010 13:01:20 -0600
Subject: 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(-)

(limited to 'test')

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." );
-- 
cgit v1.2.3


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: 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(+)

(limited to 'test')

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();
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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();
+});
-- 
cgit v1.2.3


From c27d5ca6f5b69818c48fdc9b0f988790653fb1a5 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Tue, 28 Dec 2010 21:07:04 -0500
Subject: By default, use document root rather than current selection's context
 when add()ing elements. Fixes #7853.

---
 src/traversing.js       |  2 +-
 test/unit/traversing.js | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/src/traversing.js b/src/traversing.js
index 15446bd8b..e86883d90 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -134,7 +134,7 @@ jQuery.fn.extend({
 
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
+				jQuery( selector, context ) :
 				jQuery.makeArray( selector ),
 			all = jQuery.merge( this.get(), set );
 
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 0d079f19a..b1fd8a9bf 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -440,12 +440,13 @@ test("add(String|Element|Array|undefined)", function() {
 
 test("add(String, Context)", function() {
 	expect(6);
-
-	equals( jQuery(document).add("#form").length, 2, "Make sure that using regular context document still works." );
-	equals( jQuery(document.body).add("#form").length, 2, "Using a body context." );
-	equals( jQuery(document.body).add("#html").length, 1, "Using a body context." );
-
-	equals( jQuery(document).add("#form", document).length, 2, "Use a passed in document context." );
-	equals( jQuery(document).add("#form", document.body).length, 2, "Use a passed in body context." );
-	equals( jQuery(document).add("#html", document.body).length, 1, "Use a passed in body context." );
+	
+	equals( jQuery("#firstp").add("#ap").length, 2, "Add selector to selector" );
+	equals( jQuery(document.getElementById("firstp")).add("#ap").length, 2, "Add gEBId to selector" );
+	equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap")).length, 2, "Add gEBId to gEBId" );
+
+	var ctx = document.getElementById("firstp");
+	equals( jQuery("#firstp").add("#ap", ctx).length, 1, "Add selector to selector with context" );
+	equals( jQuery(document.getElementById("firstp")).add("#ap", ctx).length, 1, "Add gEBId to selector with context" );
+	equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap"), ctx).length, 2, "Add gEBId to gEBId with context" );
 });
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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" );
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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();
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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();
+	});
+});
-- 
cgit v1.2.3


From 22e28b01e60e87b2454f88ca128fb84916b13564 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:02:45 +0100
Subject: 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(-)

(limited to 'test')

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' );
-- 
cgit v1.2.3


From 2d4001b82c6325ac6a767294e96a8af8f920f7cd Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Fri, 24 Dec 2010 18:53:55 +0100
Subject: 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(-)

(limited to 'test')

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" : "" ) );
-- 
cgit v1.2.3


From 23d455b4469f2b47363c21867aad271d6930f112 Mon Sep 17 00:00:00 2001
From: unknown <Julian@.(none)>
Date: Sat, 25 Dec 2010 01:29:04 +0100
Subject: 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       | 75 +++++++++++++++++++++++----------------------------
 test/unit/core.js | 81 +++++--------------------------------------------------
 2 files changed, 41 insertions(+), 115 deletions(-)

(limited to 'test')

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
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
+				
+				// Cancel
 				cancel: function() {
-					if ( cancellable ) {
-						callbacks = [];
-						cancelled = 1;
-					}
+					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 ) {
-		
-		// Handle varargs
-		if ( arguments.length === 1 ) {
-			
-			if ( typeof func === "boolean" ) {
-				cancellable = func;
-				func = 0;
-			}
-		}
+	Deferred: function( func ) {
 		
-		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.resolve();
+	deferred = jQuery._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() {
-- 
cgit v1.2.3


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

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

(limited to 'test')

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();
-	});
 });
-- 
cgit v1.2.3


From 981d1e08eb00f4b5c29ad1f3977a45e30c93ad70 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sat, 25 Dec 2010 18:54:37 +0100
Subject: 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

(limited to 'test')

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;
+				}
+			};
 
-		return jQuery.xhr().open( s ? s.type : undefined , url ).send( undefined , s );
+		// 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
@@ -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();
-- 
cgit v1.2.3


From 6165cc45b7f673aa0d9daf33659a2783f68a45ac Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 02:30:51 +0100
Subject: 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(-)

(limited to 'test')

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() {
-- 
cgit v1.2.3


From 6dbffb8596a9c96c68386ecc2d95da25b9dee369 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 28 Dec 2010 04:13:44 +0100
Subject: 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 | 50 +++++++++++++++++++++++---------------------------
 3 files changed, 43 insertions(+), 44 deletions(-)

(limited to 'test')

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() {
+test("jQuery.when()", function() {
 	
-	expect( 10 );
+	expect( 14 );
 	
-	var object1 = { then: function() { return this; } },
-		object2 = { then: function() { return this; } };
+	var fakeDeferred = { 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");
+	fakeDeferred.then._ = [];
 	
 	// 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() {
+	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}
 	
-	expect( 2 );
+	} , 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 ) {
-- 
cgit v1.2.3


From 6fb9759a75bf2b9a2aa3a8fce9cd7afc011d8c4f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 30 Dec 2010 17:06:53 +0100
Subject: 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(-)

(limited to 'test')

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" );
 		
 	} );
 	
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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();
-- 
cgit v1.2.3


From cbf591152c9f61381e552c9a15bb7c339f1451a9 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 5 Jan 2011 04:29:30 +0100
Subject: "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(-)

(limited to 'test')

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" );
 		});
 	}
-- 
cgit v1.2.3


From 8099cdce800d45109b961e3521fc0080e9a876c6 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 5 Jan 2011 13:32:59 -0500
Subject: Bug #7608  elem.runtimeStyle throws exception in Opera

---
 src/css.js       | 12 ++++++++----
 test/unit/css.js | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/src/css.js b/src/css.js
index 8a83c6072..19c6342d2 100644
--- a/src/css.js
+++ b/src/css.js
@@ -263,8 +263,9 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
 
 if ( document.documentElement.currentStyle ) {
 	currentStyle = function( elem, name ) {
-		var left, rsLeft,
+		var left, 
 			ret = elem.currentStyle && elem.currentStyle[ name ],
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
 			style = elem.style;
 
 		// From the awesome hack by Dean Edwards
@@ -275,16 +276,19 @@ if ( document.documentElement.currentStyle ) {
 		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
 			// Remember the original values
 			left = style.left;
-			rsLeft = elem.runtimeStyle.left;
 
 			// Put in the new values to get a computed value out
-			elem.runtimeStyle.left = elem.currentStyle.left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
 			style.left = name === "fontSize" ? "1em" : (ret || 0);
 			ret = style.pixelLeft + "px";
 
 			// Revert the changed values
 			style.left = left;
-			elem.runtimeStyle.left = rsLeft;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
 		}
 
 		return ret === "" ? "auto" : ret;
diff --git a/test/unit/css.js b/test/unit/css.js
index fbbf937ca..edc340ceb 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -320,3 +320,25 @@ test(":visible selector works properly on children with a hidden parent (bug #45
 	jQuery('#table').css('display', 'none').html('<tr><td>cell</td><td>cell</td></tr>');
 	equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible");
 });
+
+test("internal ref to elem.runtimeStyle (bug #7608)", function () {
+  expect(1);
+  
+  var result = true, 
+      val = 10;
+
+  jQuery('<div id="bug7608" style="width:200px;border:solid 1px red;">' +
+    '<div  id="test" style="width:0%; background:#000;">&nbsp;</div></div>').appendTo("body");
+    
+  try {
+	// the bug is located within src/css.js
+    jQuery("#bug7608 #test").animate( { width: val }, 1000);    
+    
+  } catch (e) {
+    result = false;  
+  }
+  
+  ok( result, "elem.runtimeStyle does not throw exception" );
+  
+  jQuery("#bug7608").remove();
+});
-- 
cgit v1.2.3


From ae6655bcb6d852b79df2ddc5545832c5d08936f4 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 5 Jan 2011 13:26:05 -0800
Subject: 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(-)

(limited to 'test')

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." );
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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 );
-- 
cgit v1.2.3


From c43b078c6911027fd4124d542446ad0098662f6a Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 6 Jan 2011 01:17:31 +0100
Subject: 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/ajax/jsonp.js        |  85 +++++++++++++++++++++
 src/ajax/script.js       |  82 ++++++++++++++++++++
 src/ajax/xhr.js          | 191 +++++++++++++++++++++++++++++++++++++++++++++++
 src/transports/jsonp.js  |  85 ---------------------
 src/transports/script.js |  82 --------------------
 src/transports/xhr.js    | 191 -----------------------------------------------
 test/index.html          |   6 +-
 10 files changed, 370 insertions(+), 370 deletions(-)
 create mode 100644 src/ajax/jsonp.js
 create mode 100644 src/ajax/script.js
 create mode 100644 src/ajax/xhr.js
 delete mode 100644 src/transports/jsonp.js
 delete mode 100644 src/transports/script.js
 delete mode 100644 src/transports/xhr.js

(limited to 'test')

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/ajax/jsonp.js b/src/ajax/jsonp.js
new file mode 100644
index 000000000..5cfb7834a
--- /dev/null
+++ b/src/ajax/jsonp.js
@@ -0,0 +1,85 @@
+(function( jQuery ) {
+
+var jsc = jQuery.now(),
+	jsre = /\=\?(&|$)/,
+	rquery_jsonp = /\?/;
+
+// Default jsonp callback name
+jQuery.ajaxSettings.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) {
+
+	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) ) ) {
+
+		var jsonp = s.jsonp = s.jsonp || "callback",
+			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;
+
+		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 ) ) {
+					window[ jsonpCallback ] ( responseContainer[0] );
+				}
+			} else {
+				// 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 ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// Delegate to script transport
+		return "script";
+	}
+});
+
+})( jQuery );
diff --git a/src/ajax/script.js b/src/ajax/script.js
new file mode 100644
index 000000000..0db0de6c7
--- /dev/null
+++ b/src/ajax/script.js
@@ -0,0 +1,82 @@
+(function( jQuery ) {
+
+// Install text to script executor
+jQuery.extend( true, jQuery.ajaxSettings , {
+
+	accepts: {
+		script: "text/javascript, application/javascript"
+	},
+
+	contents: {
+		script: /javascript/
+	},
+
+	converters: {
+		"text script": jQuery.globalEval
+	}
+} );
+
+// 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");
+
+				script.async = "async";
+
+				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" );
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// 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 );
+				}
+			}
+		};
+	}
+});
+
+})( jQuery );
diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
new file mode 100644
index 000000000..7d7140259
--- /dev/null
+++ b/src/ajax/xhr.js
@@ -0,0 +1,191 @@
+(function( jQuery ) {
+
+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 ) {
+					xhr.open(s.type, s.url, s.async, s.username, s.password);
+				} 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)
+				// Won't change header if already provided in beforeSend
+				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 );
+				} catch(e) {
+					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 =
+								// Opera returns 0 when it should be 304
+								// Webkit returns 0 for failing cross-domain no matter the real status
+								status === 0 ?
+									(
+										! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests
+										(
+											responseHeaders ? // Opera: filter out real aborts #6060
+											304
+											:
+											0
+										)
+										:
+										302 // We assume 302 but could be anything cross-domain related
+									)
+									:
+									(
+										status == 1223 ?	// IE sometimes returns 1223 when it should be 204 (see #1450)
+											204
+											:
+											status
+									);
+
+							// Guess response if needed & update datatype accordingly
+							if ( status >= 200 && status < 300 ) {
+								response =
+									determineDataType(
+										s,
+										xhr.getResponseHeader("content-type"),
+										xhr.responseText,
+										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);
+				}
+			}
+		};
+	}
+});
+
+// #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/src/transports/jsonp.js b/src/transports/jsonp.js
deleted file mode 100644
index 5cfb7834a..000000000
--- a/src/transports/jsonp.js
+++ /dev/null
@@ -1,85 +0,0 @@
-(function( jQuery ) {
-
-var jsc = jQuery.now(),
-	jsre = /\=\?(&|$)/,
-	rquery_jsonp = /\?/;
-
-// Default jsonp callback name
-jQuery.ajaxSettings.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) {
-
-	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) ) ) {
-
-		var jsonp = s.jsonp = s.jsonp || "callback",
-			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;
-
-		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 ) ) {
-					window[ jsonpCallback ] ( responseContainer[0] );
-				}
-			} else {
-				// 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 ) {
-				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
deleted file mode 100644
index 0db0de6c7..000000000
--- a/src/transports/script.js
+++ /dev/null
@@ -1,82 +0,0 @@
-(function( jQuery ) {
-
-// Install text to script executor
-jQuery.extend( true, jQuery.ajaxSettings , {
-
-	accepts: {
-		script: "text/javascript, application/javascript"
-	},
-
-	contents: {
-		script: /javascript/
-	},
-
-	converters: {
-		"text script": jQuery.globalEval
-	}
-} );
-
-// 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");
-
-				script.async = "async";
-
-				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" );
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// 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 );
-				}
-			}
-		};
-	}
-});
-
-})( jQuery );
diff --git a/src/transports/xhr.js b/src/transports/xhr.js
deleted file mode 100644
index 7d7140259..000000000
--- a/src/transports/xhr.js
+++ /dev/null
@@ -1,191 +0,0 @@
-(function( jQuery ) {
-
-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 ) {
-					xhr.open(s.type, s.url, s.async, s.username, s.password);
-				} 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)
-				// Won't change header if already provided in beforeSend
-				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 );
-				} catch(e) {
-					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 =
-								// Opera returns 0 when it should be 304
-								// Webkit returns 0 for failing cross-domain no matter the real status
-								status === 0 ?
-									(
-										! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests
-										(
-											responseHeaders ? // Opera: filter out real aborts #6060
-											304
-											:
-											0
-										)
-										:
-										302 // We assume 302 but could be anything cross-domain related
-									)
-									:
-									(
-										status == 1223 ?	// IE sometimes returns 1223 when it should be 204 (see #1450)
-											204
-											:
-											status
-									);
-
-							// Guess response if needed & update datatype accordingly
-							if ( status >= 200 && status < 300 ) {
-								response =
-									determineDataType(
-										s,
-										xhr.getResponseHeader("content-type"),
-										xhr.responseText,
-										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);
-				}
-			}
-		};
-	}
-});
-
-// #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/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>
-- 
cgit v1.2.3


From 1ca82ccd9489f11d3a8fbdd8a32b4c164ffaf483 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 6 Jan 2011 01:26:06 +0100
Subject: 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(-)

(limited to 'test')

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" );
 	});
 });
-- 
cgit v1.2.3


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

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

(limited to 'test')

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();
 		        },
-- 
cgit v1.2.3


From 69497c3fd7ff560be0e47b4c65076915cca756bc Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 04:28:42 +0100
Subject: 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(-)

(limited to 'test')

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);
 
-- 
cgit v1.2.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: 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

(limited to 'test')

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 );
-- 
cgit v1.2.3


From afefb4f3d28f47c0a93cc9dfddfcbadb595a8efb Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 06:01:00 +0100
Subject: 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(-)

(limited to 'test')

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();
-- 
cgit v1.2.3


From 63487505c678152e59847e3ab7878ea5f2514dfa Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 06:19:27 +0100
Subject: 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(+)

(limited to 'test')

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 );
-- 
cgit v1.2.3


From 5a5f67800b048ae274e644547f4b8e03156ffa49 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 16:50:13 +0100
Subject: 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(-)

(limited to 'test')

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() {
-- 
cgit v1.2.3


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

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

(limited to 'test')

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)" );
-		}
-	}
+	});
 
 });
 
-- 
cgit v1.2.3


From 8c8bd3bf6ac982f98c1b89b0af74a1fd2d07e360 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 9 Jan 2011 21:48:52 +0100
Subject: Fixes #5812. =? will be detected even when it has been escaped during
 data serialization.

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

(limited to 'test')

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",
-- 
cgit v1.2.3


From 8e59a99e0ade75dec434f246f52e8b3f7393f359 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 9 Jan 2011 15:52:33 -0600
Subject: Change the way jQuery.data works so that there is no longer a chance
 of collision between user data and internal data. Fixes #6968.

---
 src/attributes.js       |   4 +-
 src/data.js             | 162 +++++++++++++++++++++-----------
 src/effects.js          |  10 +-
 src/event.js            |  46 +++++-----
 src/manipulation.js     |  35 ++++---
 src/queue.js            |   4 +-
 test/unit/attributes.js |  10 +-
 test/unit/data.js       | 238 ++++++++++++++++++++++++++++++++----------------
 test/unit/effects.js    |   4 +-
 test/unit/event.js      |  20 ++--
 10 files changed, 341 insertions(+), 192 deletions(-)

(limited to 'test')

diff --git a/src/attributes.js b/src/attributes.js
index fec132340..d37400a68 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -133,11 +133,11 @@ jQuery.fn.extend({
 			} else if ( type === "undefined" || type === "boolean" ) {
 				if ( this.className ) {
 					// store className if set
-					jQuery.data( this, "__className__", this.className );
+					jQuery._data( this, "__className__", this.className );
 				}
 
 				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
 			}
 		});
 	},
diff --git a/src/data.js b/src/data.js
index 4d1d1bd55..a1abc9ed6 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,6 @@
 (function( jQuery ) {
 
-var windowData = {},
-	rbrace = /^(?:\{.*\}|\[.*\])$/;
+var rbrace = /^(?:\{.*\}|\[.*\])$/;
 
 jQuery.extend({
 	cache: {},
@@ -23,110 +22,163 @@ jQuery.extend({
 	},
 
 	hasData: function( elem ) {
-		if ( elem.nodeType ) {
-			elem = jQuery.cache[ elem[jQuery.expando] ];
-		}
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
 
 		return !!elem && !jQuery.isEmptyObject(elem);
 	},
 
-	data: function( elem, name, data ) {
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
 		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
 
-		var isNode = elem.nodeType,
-			id = isNode ? elem[ jQuery.expando ] : null,
-			cache = jQuery.cache, thisCache;
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
 
-		if ( isNode && !id && typeof name === "string" && data === undefined ) {
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
 			return;
 		}
 
-		// Get the data from the object directly
-		if ( !isNode ) {
-			cache = elem;
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ jQuery.expando ] = id = ++jQuery.uuid;
+			} else {
+				id = jQuery.expando;
+			}
+		}
 
-		// Compute a unique ID for the element
-		} else if ( !id ) {
-			elem[ jQuery.expando ] = id = ++jQuery.uuid;
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
 		}
 
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
 		if ( typeof name === "object" ) {
-			if ( isNode ) {
+			if ( pvt ) {
+				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
+			} else {
 				cache[ id ] = jQuery.extend(cache[ id ], name);
+			}
+		}
 
-			} else {
-				jQuery.extend( cache, name );
+		thisCache = cache[ id ];
+
+		// Internal jQuery data is stored in a separate object inside the object's data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data
+		if ( pvt ) {
+			if ( !thisCache[ internalKey ] ) {
+				thisCache[ internalKey ] = {};
 			}
 
-		} else if ( isNode && !cache[ id ] ) {
-			cache[ id ] = {};
+			thisCache = thisCache[ internalKey ];
 		}
 
-		thisCache = isNode ? cache[ id ] : cache;
-
-		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
 			thisCache[ name ] = data;
 		}
 
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
+		return getByName ? thisCache[ name ] : thisCache;
 	},
 
-	removeData: function( elem, name ) {
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
 		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var internalKey = jQuery.expando, isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
 
-		var isNode = elem.nodeType,
-			id = isNode ? elem[ jQuery.expando ] : elem,
-			cache = jQuery.cache,
-			thisCache = isNode ? cache[ id ] : id;
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
 
-		// If we want to remove a specific section of the element's data
 		if ( name ) {
+			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
+
 			if ( thisCache ) {
-				// Remove the section of cache data
 				delete thisCache[ name ];
 
-				// If we've removed all the data, remove the element's cache
-				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !jQuery.isEmptyObject(thisCache) ) {
+					return;
 				}
 			}
+		}
+
+		// See jQuery.data for more information
+		if ( pvt ) {
+			delete cache[ id ][ internalKey ];
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !jQuery.isEmptyObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		var internalCache = cache[ id ][ internalKey ];
 
-		// Otherwise, we want to remove all of the element's data
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		if ( jQuery.support.deleteExpando || cache != window ) {
+			delete cache[ id ];
 		} else {
-			if ( isNode && jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
+			cache[ id ] = null;
+		}
 
+		// We destroyed the entire user cache at once because it's faster than
+		// iterating through each key, but we need to continue to persist internal
+		// data if it existed
+		if ( internalCache ) {
+			cache[ id ] = {};
+			cache[ id ][ internalKey ] = internalCache;
+
+		// Otherwise, we need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		} else if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
 			} else if ( elem.removeAttribute ) {
 				elem.removeAttribute( jQuery.expando );
-
-			// Completely remove the data cache
-			} else if ( isNode ) {
-				delete cache[ id ];
-
-			// Remove all fields from the object
 			} else {
-				for ( var n in elem ) {
-					delete elem[ n ];
-				}
+				elem[ jQuery.expando ] = null;
 			}
 		}
 	},
 
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
 	// A method for determining if a DOM node can handle the data expando
 	acceptData: function( elem ) {
 		if ( elem.nodeName ) {
diff --git a/src/effects.js b/src/effects.js
index bd57ffc3d..b0675395f 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -27,7 +27,7 @@ jQuery.fn.extend({
 
 				// Reset the inline display of this element to learn if it is
 				// being hidden by cascaded rules or not
-				if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+				if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
 					display = elem.style.display = "";
 				}
 
@@ -35,7 +35,7 @@ jQuery.fn.extend({
 				// in a stylesheet to whatever the default browser style is
 				// for such an element
 				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
-					jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+					jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
 				}
 			}
 
@@ -46,7 +46,7 @@ jQuery.fn.extend({
 				display = elem.style.display;
 
 				if ( display === "" || display === "none" ) {
-					elem.style.display = jQuery.data(elem, "olddisplay") || "";
+					elem.style.display = jQuery._data(elem, "olddisplay") || "";
 				}
 			}
 
@@ -62,8 +62,8 @@ jQuery.fn.extend({
 			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 );
+				if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+					jQuery._data( this[i], "olddisplay", display );
 				}
 			}
 
diff --git a/src/event.js b/src/event.js
index 675e5fff3..7fa5488ee 100644
--- a/src/event.js
+++ b/src/event.js
@@ -8,7 +8,8 @@ var rnamespaces = /\.(.*)$/,
 	fcleanup = function( nm ) {
 		return nm.replace(rescape, "\\$&");
 	},
-	focusCounts = { focusin: 0, focusout: 0 };
+	focusCounts = { focusin: 0, focusout: 0 },
+	eventKey = "events";
 
 /*
  * A number of helper functions used for managing events.
@@ -50,7 +51,7 @@ jQuery.event = {
 		}
 
 		// Init the element's event structure
-		var elemData = jQuery.data( elem );
+		var elemData = jQuery._data( elem );
 
 		// If no elemData is found then we must be trying to bind to one of the
 		// banned noData elements
@@ -58,10 +59,7 @@ jQuery.event = {
 			return;
 		}
 
-		// Use a key less likely to result in collisions for plain JS objects.
-		// Fixes bug #7150.
-		var eventKey = elem.nodeType ? "events" : "__events__",
-			events = elemData[ eventKey ],
+		var events = elemData[ eventKey ],
 			eventHandle = elemData.handle;
 
 		if ( typeof events === "function" ) {
@@ -177,8 +175,7 @@ jQuery.event = {
 		}
 
 		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			eventKey = elem.nodeType ? "events" : "__events__",
-			elemData = jQuery.data( elem ),
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
 			events = elemData && elemData[ eventKey ];
 
 		if ( !elemData || !events ) {
@@ -290,10 +287,10 @@ jQuery.event = {
 			delete elemData.handle;
 
 			if ( typeof elemData === "function" ) {
-				jQuery.removeData( elem, eventKey );
+				jQuery.removeData( elem, eventKey, true );
 
 			} else if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
+				jQuery.removeData( elem, undefined, true );
 			}
 		}
 	},
@@ -325,9 +322,16 @@ jQuery.event = {
 
 				// Only trigger if we've ever bound an event for it
 				if ( jQuery.event.global[ type ] ) {
+					// XXX This code smells terrible. event.js should not be directly
+					// inspecting the data cache
 					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
+						// internalKey variable is just used to make it easier to find
+						// and potentially change this stuff later; currently it just
+						// points to jQuery.expando
+						var internalKey = jQuery.expando,
+							internalCache = this[ internalKey ];
+						if ( internalCache && internalCache.events && internalCache.events[type] ) {
+							jQuery.event.trigger( event, data, internalCache.handle.elem );
 						}
 					});
 				}
@@ -353,8 +357,8 @@ jQuery.event = {
 
 		// Trigger the event, it is assumed that "handle" is a function
 		var handle = elem.nodeType ?
-			jQuery.data( elem, "handle" ) :
-			(jQuery.data( elem, "__events__" ) || {}).handle;
+			jQuery._data( elem, "handle" ) :
+			(jQuery._data( elem, eventKey ) || {}).handle;
 
 		if ( handle ) {
 			handle.apply( elem, data );
@@ -432,7 +436,7 @@ jQuery.event = {
 
 		event.namespace = event.namespace || namespace_sort.join(".");
 
-		events = jQuery.data(this, this.nodeType ? "events" : "__events__");
+		events = jQuery._data(this, eventKey);
 
 		if ( typeof events === "function" ) {
 			events = events.events;
@@ -787,12 +791,12 @@ if ( !jQuery.support.changeBubbles ) {
 			return;
 		}
 
-		data = jQuery.data( elem, "_change_data" );
+		data = jQuery._data( elem, "_change_data" );
 		val = getVal(elem);
 
 		// the current data will be also retrieved by beforeactivate
 		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
+			jQuery._data( elem, "_change_data", val );
 		}
 
 		if ( data === undefined || val === data ) {
@@ -837,7 +841,7 @@ if ( !jQuery.support.changeBubbles ) {
 			// information
 			beforeactivate: function( e ) {
 				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
+				jQuery._data( elem, "_change_data", getVal(elem) );
 			}
 		},
 
@@ -986,8 +990,8 @@ jQuery.fn.extend({
 
 		return this.click( jQuery.proxy( fn, function( event ) {
 			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
 
 			// Make sure that clicks stop
 			event.preventDefault();
@@ -1075,7 +1079,7 @@ function liveHandler( event ) {
 	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
 		elems = [],
 		selectors = [],
-		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
+		events = jQuery._data( this, eventKey );
 
 	if ( typeof events === "function" ) {
 		events = events.events;
diff --git a/src/manipulation.js b/src/manipulation.js
index 96caa02d0..657aef7d1 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -381,17 +381,24 @@ function cloneCopyEvent(orig, ret) {
 			throw "Cloned data mismatch";
 		}
 
-		var oldData = jQuery.data( orig[nodeIndex] ),
-			curData = jQuery.data( this, oldData ),
-			events = oldData && oldData.events;
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( this, type, events[ type ][ i ], events[ type ][ i ].data );
+		var internalKey = jQuery.expando,
+			oldData = jQuery.data( orig[nodeIndex] ),
+			curData = jQuery.data( this, oldData );
+
+		// Switch to use the internal data object, if it exists, for the next
+		// stage of data copying
+		if ( (oldData = oldData[ internalKey ]) ) {
+			var events = oldData.events;
+			curData = curData[ internalKey ] = jQuery.extend({}, oldData);
+
+			if ( events ) {
+				delete curData.handle;
+				curData.events = {};
+
+				for ( var type in events ) {
+					for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+						jQuery.event.add( this, type, events[ type ][ i ], events[ type ][ i ].data );
+					}
 				}
 			}
 		}
@@ -594,8 +601,7 @@ jQuery.extend({
 	},
 
 	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
+		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
 			deleteExpando = jQuery.support.deleteExpando;
 
 		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
@@ -606,13 +612,14 @@ jQuery.extend({
 			id = elem[ jQuery.expando ];
 
 			if ( id ) {
-				data = cache[ id ];
+				data = cache[ id ] && cache[ id ][ internalKey ];
 
 				if ( data && data.events ) {
 					for ( var type in data.events ) {
 						if ( special[ type ] ) {
 							jQuery.event.remove( elem, type );
 
+						// This is a shortcut to avoid jQuery.event.remove's overhead
 						} else {
 							jQuery.removeEvent( elem, type, data.handle );
 						}
diff --git a/src/queue.js b/src/queue.js
index 735b0e189..5fb04df80 100644
--- a/src/queue.js
+++ b/src/queue.js
@@ -7,7 +7,7 @@ jQuery.extend({
 		}
 
 		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
+		var q = jQuery._data( elem, type );
 
 		// Speed up dequeue by getting out quickly if this is just a lookup
 		if ( !data ) {
@@ -15,7 +15,7 @@ jQuery.extend({
 		}
 
 		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+			q = jQuery._data( elem, type, jQuery.makeArray(data) );
 
 		} else {
 			q.push( data );
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index a1ab58179..04f168466 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -703,12 +703,12 @@ var testToggleClass = function(valueObj) {
 
 	// toggleClass storage
 	e.toggleClass(true);
-	ok( e.get(0).className === "", "Assert class is empty (data was empty)" );
+	ok( e[0].className === "", "Assert class is empty (data was empty)" );
 	e.addClass("testD testE");
 	ok( e.is(".testD.testE"), "Assert class present" );
 	e.toggleClass();
 	ok( !e.is(".testD.testE"), "Assert class not present" );
-	ok( e.data('__className__') === 'testD testE', "Assert data was stored" );
+	ok( jQuery._data(e[0], '__className__') === 'testD testE', "Assert data was stored" );
 	e.toggleClass();
 	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
 	e.toggleClass(false);
@@ -720,11 +720,9 @@ var testToggleClass = function(valueObj) {
 	e.toggleClass();
 	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
 
-
-
 	// Cleanup
 	e.removeClass("testD");
-	e.removeData('__className__');
+	jQuery.removeData(e[0], '__className__', true);
 };
 
 test("toggleClass(String|boolean|undefined[, boolean])", function() {
@@ -785,7 +783,7 @@ test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
 
 	// Cleanup
 	e.removeClass("test");
-	e.removeData('__className__');
+	jQuery.removeData(e[0], '__className__', true);
 });
 
 test("addClass, removeClass, hasClass", function() {
diff --git a/test/unit/data.js b/test/unit/data.js
index 310cd6bc4..28e19a3e2 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -1,96 +1,177 @@
-module("data");
+module("data", { teardown: moduleTeardown });
 
 test("expando", function(){
-	expect(6);
+	expect(1);
 
 	equals("expando" in jQuery, true, "jQuery is exposing the expando");
+});
 
-	var obj = {};
-	equals( jQuery.data(obj), obj, "jQuery.data(obj) returns the object");
-	equals( jQuery.expando in obj, false, "jQuery.data(obj) did not add an expando to the object" );
+function dataTests (elem) {
+	// expect(32)
 
-	obj = {};
-	jQuery.data(obj, 'test');
-	equals( jQuery.expando in obj, false, "jQuery.data(obj,key) did not add an expando to the object" );
+	function getCacheLength() {
+		var cacheLength = 0;
+		for (var i in jQuery.cache) {
+			++cacheLength;
+		}
 
-	obj = {};
-	jQuery.data(obj, "foo", "bar");
-	equals( jQuery.expando in obj, false, "jQuery.data(obj,key,value) did not add an expando to the object" );
-	equals( obj.foo, "bar", "jQuery.data(obj,key,value) sets fields directly on the object." );
-});
+		return cacheLength;
+	}
 
-test("jQuery.acceptData", function() {
-	expect(7);
+	equals( jQuery.data(elem, "foo"), undefined, "No data exists initially" );
+	strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees no data exists initially" );
 
-	ok( jQuery.acceptData( document ), "document" );
-	ok( jQuery.acceptData( document.documentElement ), "documentElement" );
-	ok( jQuery.acceptData( {} ), "object" );
-	ok( !jQuery.acceptData( document.createElement("embed") ), "embed" );
-	ok( !jQuery.acceptData( document.createElement("applet") ), "applet" );
+	var dataObj = jQuery.data(elem);
+	equals( typeof dataObj, "object", "Calling data with no args gives us a data object reference" );
+	strictEqual( jQuery.data(elem), dataObj, "Calling jQuery.data returns the same data object when called multiple times" );
 
-	var flash = document.createElement("object");
-	flash.setAttribute("classid", "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000");
-	ok( jQuery.acceptData( flash ), "flash" );
+	strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees no data exists even when an empty data obj exists" );
 
-	var applet = document.createElement("object");
-	applet.setAttribute("classid", "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93");
-	ok( !jQuery.acceptData( applet ), "applet" );
-});
+	dataObj.foo = "bar";
+	equals( jQuery.data(elem, "foo"), "bar", "Data is readable by jQuery.data when set directly on a returned data object" );
 
-test("jQuery.data", function() {
-	expect(15);
-	var div = document.createElement("div");
+	strictEqual( jQuery.hasData(elem), true, "jQuery.hasData agrees data exists when data exists" );
 
-	ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
+	jQuery.data(elem, "foo", "baz");
+	equals( jQuery.data(elem, "foo"), "baz", "Data can be changed by jQuery.data" );
+	equals( dataObj.foo, "baz", "Changes made through jQuery.data propagate to referenced data object" );
 
-	jQuery.data(div, "test", "success");
-	equals( jQuery.data(div, "test"), "success", "Check for added data" );
+	jQuery.data(elem, "foo", undefined);
+	equals( jQuery.data(elem, "foo"), "baz", "Data is not unset by passing undefined to jQuery.data" );
 
-	ok( jQuery.data(div, "notexist") === undefined, "Check for no data exists" );
+	jQuery.data(elem, "foo", null);
+	strictEqual( jQuery.data(elem, "foo"), null, "Setting null using jQuery.data works OK" );
 
-	var data = jQuery.data(div);
-	same( data, { "test": "success" }, "Return complete data set" );
+	jQuery.data(elem, "foo", "foo1");
 
-	jQuery.data(div, "test", "overwritten");
-	equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" );
+	jQuery.data(elem, { "bar" : "baz", "boom" : "bloz" });
+	strictEqual( jQuery.data(elem, "foo"), "foo1", "Passing an object extends the data object instead of replacing it" );
+	equals( jQuery.data(elem, "boom"), "bloz", "Extending the data object works" );
 
-	jQuery.data(div, "test", undefined);
-	equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed");
+	jQuery._data(elem, "foo", "foo2");
+	equals( jQuery._data(elem, "foo"), "foo2", "Setting internal data works" );
+	equals( jQuery.data(elem, "foo"), "foo1", "Setting internal data does not override user data" );
 
-	jQuery.data(div, "test", null);
-	ok( jQuery.data(div, "test") === null, "Check for null data");
+	var internalDataObj = jQuery.data(elem, jQuery.expando);
+	strictEqual( jQuery._data(elem), internalDataObj, "Internal data object is accessible via jQuery.expando property" );
+	notStrictEqual( dataObj, internalDataObj, "Internal data object is not the same as user data object" );
 
-	jQuery.data(div, "test3", "orig");
-	jQuery.data(div, { "test": "in", "test2": "in2" });
-	equals( jQuery.data(div, "test"), "in", "Verify setting an object in data" );
-	equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data" );
-	equals( jQuery.data(div, "test3"), "orig", "Verify original not overwritten" );
+	strictEqual( elem.boom, undefined, "Data is never stored directly on the object" );
 
-	var obj = {};
-	jQuery.data( obj, "prop", true );
+	jQuery.removeData(elem, "foo");
+	strictEqual( jQuery.data(elem, "foo"), undefined, "jQuery.removeData removes single properties" );
 
-	ok( obj.prop, "Data is being stored on the object" );
-	equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved" );
+	jQuery.removeData(elem);
+	strictEqual( jQuery.data(elem, jQuery.expando), internalDataObj, "jQuery.removeData does not remove internal data if it exists" );
 
-	jQuery.data( window, "BAD", true );
-	ok( !window[ jQuery.expando ], "Make sure there is no expando on the window object." );
-	ok( !window.BAD, "And make sure that the property wasn't set directly on the window." );
-	ok( jQuery.data( window, "BAD" ), "Make sure that the value was set." );
-});
+	jQuery.removeData(elem, undefined, true);
 
-test("jQuery.hasData", function() {
-	expect(6);
+	strictEqual( jQuery.data(elem, jQuery.expando), undefined, "jQuery.removeData on internal data works" );
+	strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees all data has been removed from object" );
+
+	jQuery._data(elem, "foo", "foo2");
+	strictEqual( jQuery.hasData(elem), true, "jQuery.hasData shows data exists even if it is only internal data" );
+
+	jQuery.data(elem, "foo", "foo1");
+	equals( jQuery._data(elem, "foo"), "foo2", "Setting user data does not override internal data" );
+
+	jQuery.removeData(elem, undefined, true);
+	equals( jQuery.data(elem, "foo"), "foo1", "jQuery.removeData for internal data does not remove user data" );
+
+	if (elem.nodeType) {
+		var oldCacheLength = getCacheLength();
+		jQuery.removeData(elem, "foo");
 
-	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" );
+		equals( getCacheLength(), oldCacheLength - 1, "Removing the last item in the data object destroys it" );
 	}
+	else {
+		jQuery.removeData(elem, "foo");
+		var expected, actual;
+
+		if (jQuery.support.deleteExpando) {
+			expected = false;
+			actual = jQuery.expando in elem;
+		}
+		else {
+			expected = null;
+			actual = elem[ jQuery.expando ];
+		}
+
+		equals( actual, expected, "Removing the last item in the data object destroys it" );
+	}
+
+	jQuery.data(elem, "foo", "foo1");
+	jQuery._data(elem, "foo", "foo2");
+
+	equals( jQuery.data(elem, "foo"), "foo1", "(sanity check) Ensure data is set in user data object" );
+	equals( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" );
+
+	jQuery.removeData(elem, "foo", true);
+
+	strictEqual( jQuery.data(elem, jQuery.expando), undefined, "Removing the last item in internal data destroys the internal data object" );
+
+	jQuery._data(elem, "foo", "foo2");
+	equals( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" );
 
-	testData(document.createElement('div'));
-	testData({});
+	jQuery.removeData(elem, "foo");
+	equals( jQuery._data(elem, "foo"), "foo2", "(sanity check) jQuery.removeData for user data does not remove internal data" );
+
+	if (elem.nodeType) {
+		oldCacheLength = getCacheLength();
+		jQuery.removeData(elem, "foo", true);
+		equals( getCacheLength(), oldCacheLength - 1, "Removing the last item in the internal data object also destroys the user data object when it is empty" );
+	}
+	else {
+		jQuery.removeData(elem, "foo", true);
+
+		if (jQuery.support.deleteExpando) {
+			expected = false;
+			actual = jQuery.expando in elem;
+		}
+		else {
+			expected = null;
+			actual = elem[ jQuery.expando ];
+		}
+
+		equals( actual, expected, "Removing the last item in the internal data object also destroys the user data object when it is empty" );
+	}
+}
+
+test("jQuery.data", function() {
+	expect(128);
+
+	var div = document.createElement("div");
+
+	dataTests(div);
+	dataTests({});
+
+	// remove bound handlers from window object to stop potential false positives caused by fix for #5280 in
+	// transports/xhr.js
+	jQuery(window).unbind("unload");
+
+	dataTests(window);
+	dataTests(document);
+
+	// clean up unattached element
+	jQuery(div).remove();
+});
+
+test("jQuery.acceptData", function() {
+	expect(7);
+
+	ok( jQuery.acceptData( document ), "document" );
+	ok( jQuery.acceptData( document.documentElement ), "documentElement" );
+	ok( jQuery.acceptData( {} ), "object" );
+	ok( !jQuery.acceptData( document.createElement("embed") ), "embed" );
+	ok( !jQuery.acceptData( document.createElement("applet") ), "applet" );
+
+	var flash = document.createElement("object");
+	flash.setAttribute("classid", "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000");
+	ok( jQuery.acceptData( flash ), "flash" );
+
+	var applet = document.createElement("object");
+	applet.setAttribute("classid", "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93");
+	ok( !jQuery.acceptData( applet ), "applet" );
 });
 
 test(".data()", function() {
@@ -98,7 +179,6 @@ test(".data()", function() {
 
 	var div = jQuery("#foo");
 	strictEqual( div.data("foo"), undefined, "Make sure that missing result is undefined" );
-
 	div.data("test", "success");
 	same( div.data(), {test: "success"}, "data() get the entire data object" );
 	strictEqual( div.data("foo"), undefined, "Make sure that missing result is still undefined" );
@@ -107,7 +187,7 @@ test(".data()", function() {
 	equals( nodiv.data(), null, "data() on empty set returns null" );
 
 	var obj = { foo: "bar" };
-	equals( jQuery(obj).data(), obj, "Retrieve data object from a wrapped JS object (#7524)" );
+	deepEqual( jQuery(obj).data(), {}, "Retrieve data object from a wrapped JS object (#7524)" );
 })
 
 test(".data(String) and .data(String, Object)", function() {
@@ -194,11 +274,14 @@ test(".data(String) and .data(String, Object)", function() {
 	equals( $elem.data('null',null).data('null'), null, "null's are preserved");
 	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" );
+	equals( $elem.data('exists'), undefined, "Existing data is not returned" );
 
 	// Clean up
 	$elem.removeData();
-	ok( jQuery.isEmptyObject( $elem[0] ), "removeData clears the object" );
+	deepEqual( $elem[0], {exists:true}, "removeData does not clear the object" );
+
+	// manually clean up detached elements
+	parent.remove();
 });
 
 test("data-* attributes", function() {
@@ -323,13 +406,17 @@ test(".data(Object)", function() {
 
 	var obj = {test:"unset"},
 		jqobj = jQuery(obj);
+	jqobj.data("test", "unset");
 	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( jQuery.data(obj).test, "in", "Verify setting an object on an object extends the data object" );
+	equals( obj.test2, undefined, "Verify setting an object on an object does not extend the object" );
+
+	// manually clean up detached elements
+	div.remove();
 });
 
 test("jQuery.removeData", function() {
-	expect(7);
+	expect(6);
 	var div = jQuery("#foo")[0];
 	jQuery.data(div, "test", "testing");
 	jQuery.removeData(div, "test");
@@ -342,10 +429,9 @@ test("jQuery.removeData", function() {
 
 	var obj = {};
 	jQuery.data(obj, "test", "testing");
-	equals( obj.test, "testing", "verify data on plain object");
+	equals( jQuery(obj).data("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" );
 
 	jQuery.data( window, "BAD", true );
 	jQuery.removeData( window, "BAD" );
@@ -371,4 +457,4 @@ test(".removeData()", function() {
 
 	div.removeData("test.foo");
 	equals( div.data("test.foo"), undefined, "Make sure data is intact" );
-});
+});
\ No newline at end of file
diff --git a/test/unit/effects.js b/test/unit/effects.js
index b7b60abbe..cf9d13109 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -895,7 +895,7 @@ test("hide hidden elements (bug #7141)", function() {
 	var div = jQuery("<div style='display:none'></div>").appendTo("#main");
 	equals( div.css("display"), "none", "Element is hidden by default" );
 	div.hide();
-	ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+	ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
 	div.show();
 	equals( div.css("display"), "block", "Show a double-hidden element" );
 
@@ -910,7 +910,7 @@ test("hide hidden elements, with animation (bug #7141)", function() {
 	var div = jQuery("<div style='display:none'></div>").appendTo("#main");
 	equals( div.css("display"), "none", "Element is hidden by default" );
 	div.hide(1, function () {
-		ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+		ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
 		div.show(1, function () {
 			equals( div.css("display"), "block", "Show a double-hidden element" );
 			start();
diff --git a/test/unit/event.js b/test/unit/event.js
index b4672a8b8..cae1a83fe 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -28,7 +28,7 @@ test("bind(), with data", function() {
 	};
 	jQuery("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
 
-	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
+	ok( !jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
 });
 
 test("click(), with data", function() {
@@ -39,7 +39,7 @@ test("click(), with data", function() {
 	};
 	jQuery("#firstp").click({foo: "bar"}, handler).click().unbind("click", handler);
 
-	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
+	ok( !jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
 });
 
 test("bind(), with data, trigger with data", function() {
@@ -505,7 +505,7 @@ test("bind(), with different this object", function() {
 		.bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1)
 		.bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2);
 
-	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
+	ok( !jQuery._data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
 
 test("bind(name, false), unbind(name, false)", function() {
@@ -547,7 +547,7 @@ test("bind()/trigger()/unbind() on plain object", function() {
 		}
 	});
 
-	var events = jQuery(obj).data("__events__");
+	var events = jQuery._data(obj, "events");
 	ok( events, "Object has events bound." );
 	equals( obj.events, undefined, "Events object on plain objects is not events" );
 	equals( typeof events, "function", "'events' expando is a function on plain objects." );
@@ -567,7 +567,9 @@ 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" );
+	equals( obj && obj[ jQuery.expando ] &&
+		    obj[ jQuery.expando ][ jQuery.expando ] &&
+			obj[ jQuery.expando ][ jQuery.expando ].events, undefined, "Make sure events object is removed" );
 });
 
 test("unbind(type)", function() {
@@ -947,7 +949,7 @@ test("toggle(Function, Function, ...)", function() {
 	equals( turn, 2, "Trying toggle with 3 functions, attempt 5 yields 2");
 
 	$div.unbind('click',fns[0]);
-	var data = jQuery.data( $div[0], 'events' );
+	var data = jQuery._data( $div[0], 'events' );
 	ok( !data, "Unbinding one function from toggle unbinds them all");
 
 	// Test Multi-Toggles
@@ -1065,7 +1067,7 @@ test(".live()/.die()", function() {
 	equals( clicked, 2, "live with a context" );
 
 	// Make sure the event is actually stored on the context
-	ok( jQuery.data(container, "events").live, "live with a context" );
+	ok( jQuery._data(container, "events").live, "live with a context" );
 
 	// Test unbinding with a different context
 	jQuery("#foo", container).die("click");
@@ -1578,7 +1580,7 @@ test(".delegate()/.undelegate()", function() {
 	equals( clicked, 2, "delegate with a context" );
 
 	// Make sure the event is actually stored on the context
-	ok( jQuery.data(container, "events").live, "delegate with a context" );
+	ok( jQuery._data(container, "events").live, "delegate with a context" );
 
 	// Test unbinding with a different context
 	jQuery("#main").undelegate("#foo", "click");
@@ -1907,7 +1909,7 @@ test("window resize", function() {
 		ok( true, "Resize event fired." );
 	}).resize().unbind("resize");
 
-	ok( !jQuery(window).data("__events__"), "Make sure all the events are gone." );
+	ok( !jQuery._data(window, "__events__"), "Make sure all the events are gone." );
 });
 
 test("focusin bubbles", function() {
-- 
cgit v1.2.3


From e2941d5a98e91c5f61b200b2763e5fa0eb339365 Mon Sep 17 00:00:00 2001
From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 9 Jan 2011 15:58:47 -0600
Subject: Update unit tests with a leak detection mechanism for the various
 jQuery globals and fix all leaks in the tests.

---
 test/data/testinit.js     | 49 ++++++++++++++++++++++++++++++++++++
 test/index.html           |  2 +-
 test/unit/ajax.js         |  2 +-
 test/unit/attributes.js   |  2 +-
 test/unit/core.js         |  5 +++-
 test/unit/css.js          |  2 +-
 test/unit/data.js         |  4 +++
 test/unit/dimensions.js   | 18 +++++++++++++-
 test/unit/effects.js      | 31 ++++++++++++++---------
 test/unit/event.js        | 41 +++++++++++++++++++++++++++---
 test/unit/manipulation.js | 63 +++++++++++++++++++++++++++++++++++++----------
 test/unit/offset.js       |  2 +-
 test/unit/queue.js        |  2 +-
 test/unit/selector.js     |  2 +-
 test/unit/traversing.js   |  2 +-
 15 files changed, 189 insertions(+), 38 deletions(-)

(limited to 'test')

diff --git a/test/data/testinit.js b/test/data/testinit.js
index a66f71d25..c478390d5 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -45,3 +45,52 @@ function t(a,b,c) {
 function url(value) {
 	return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000);
 }
+
+(function () {
+	// Store the old counts so that we only assert on tests that have actually leaked,
+	// instead of asserting every time a test has leaked sometime in the past
+	var oldCacheLength = 0,
+		oldFragmentsLength = 0,
+		oldTimersLength = 0,
+		oldActive = 0;
+
+	/**
+	 * Ensures that tests have cleaned up properly after themselves. Should be passed as the
+	 * teardown function on all modules' lifecycle object.
+	 */
+	this.moduleTeardown = function () {
+		var i, fragmentsLength = 0, cacheLength = 0;
+
+		// Allow QUnit.reset to clean up any attached elements before checking for leaks
+		QUnit.reset();
+
+		for ( i in jQuery.cache ) {
+			++cacheLength;
+		}
+
+		jQuery.fragments = {};
+
+		for ( i in jQuery.fragments ) {
+			++fragmentsLength;
+		}
+
+		// Because QUnit doesn't have a mechanism for retrieving the number of expected assertions for a test,
+		// if we unconditionally assert any of these, the test will fail with too many assertions :|
+		if ( cacheLength !== oldCacheLength ) {
+			equals( cacheLength, oldCacheLength, "No unit tests leak memory in jQuery.cache" );
+			oldCacheLength = cacheLength;
+		}
+		if ( fragmentsLength !== oldFragmentsLength ) {
+			equals( fragmentsLength, oldFragmentsLength, "No unit tests leak memory in jQuery.fragments" );
+			oldFragmentsLength = fragmentsLength;
+		}
+		if ( jQuery.timers.length !== oldTimersLength ) {
+			equals( jQuery.timers.length, oldTimersLength, "No timers are still running" );
+			oldTimersLength = jQuery.timers.length;
+		}
+		if ( jQuery.active !== oldActive ) {
+			equals( jQuery.active, 0, "No AJAX requests are still active" );
+			oldActive = jQuery.active;
+		}
+	}
+}());
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index bbeda63a6..fc5f667d2 100644
--- a/test/index.html
+++ b/test/index.html
@@ -264,7 +264,7 @@ Z</textarea>
 			<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
 
 			<div id="fadetogglein" class='chain test'>fadeToggleIn<div>fadeToggleIn</div></div>
-      <div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
+			<div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
 
 			<div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
 		</div>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 773088fc9..d29eddbfa 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1,4 +1,4 @@
-module("ajax");
+module("ajax", { teardown: moduleTeardown });
 
 // Safari 3 randomly crashes when running these tests,
 // but only in the full suite - you can run just the Ajax
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 04f168466..c58111de1 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1,4 +1,4 @@
-module("attributes");
+module("attributes", { teardown: moduleTeardown });
 
 var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
diff --git a/test/unit/core.js b/test/unit/core.js
index 8fd060578..6231b1d53 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1,4 +1,4 @@
-module("core");
+module("core", { teardown: moduleTeardown });
 
 test("Basic requirements", function() {
 	expect(7);
@@ -84,6 +84,9 @@ test("jQuery()", function() {
 
 	exec = true;
 	elem.click();
+
+	// manually clean up detached elements
+	elem.remove();
 });
 
 test("selector state", function() {
diff --git a/test/unit/css.js b/test/unit/css.js
index fbbf937ca..063707196 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,4 +1,4 @@
-module("css");
+module("css", { teardown: moduleTeardown });
 
 test("css(String|Hash)", function() {
 	expect(41);
diff --git a/test/unit/data.js b/test/unit/data.js
index 28e19a3e2..889fc2da3 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -301,6 +301,8 @@ test("data-* attributes", function() {
 	div.data("attr", "internal").attr("data-attr", "external");
 	equals( div.data("attr"), "internal", "Check for .data('attr') precedence (internal > external data-* attribute)" );
 
+	div.remove();
+
 	child.appendTo('#main');
 	equals( child.data("myobj"), "old data", "Value accessed from data-* attribute");
 
@@ -312,6 +314,8 @@ test("data-* attributes", function() {
 
 	var obj = child.data(), obj2 = dummy.data(), check = [ "myobj", "ignored", "other" ], num = 0, num2 = 0;
 
+	dummy.remove();
+
 	for ( var i = 0, l = check.length; i < l; i++ ) {
 		ok( obj[ check[i] ], "Make sure data- property exists when calling data-." );
 		ok( obj2[ check[i] ], "Make sure data- property exists when calling data-." );
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index b38e73bba..fa59a9f77 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -1,4 +1,4 @@
-module("dimensions");
+module("dimensions", { teardown: moduleTeardown });
 
 function pass( val ) {
 	return val;
@@ -33,6 +33,8 @@ function testWidth( val ) {
 	var blah = jQuery("blah");
 	equals( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
 	equals( blah.width(), null, "Make sure 'null' is returned on an empty set");
+
+	jQuery.removeData($div[0], 'olddisplay', true);
 }
 
 test("width()", function() {
@@ -80,6 +82,8 @@ function testHeight( val ) {
 	var blah = jQuery("blah");
 	equals( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
 	equals( blah.height(), null, "Make sure 'null' is returned on an empty set");
+
+	jQuery.removeData($div[0], 'olddisplay', true);
 }
 
 test("height()", function() {
@@ -126,6 +130,9 @@ test("innerWidth()", function() {
 
 	// Temporarily require 0 for backwards compat - should be auto
 	equals( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
+
+	div.remove();
+	jQuery.removeData($div[0], 'olddisplay', true);
 });
 
 test("innerHeight()", function() {
@@ -152,6 +159,9 @@ test("innerHeight()", function() {
 
 	// Temporarily require 0 for backwards compat - should be auto
 	equals( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
+
+	div.remove();
+	jQuery.removeData($div[0], 'olddisplay', true);
 });
 
 test("outerWidth()", function() {
@@ -179,6 +189,9 @@ test("outerWidth()", function() {
 
 	// Temporarily require 0 for backwards compat - should be auto
 	equals( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
+
+	div.remove();
+	jQuery.removeData($div[0], 'olddisplay', true);
 });
 
 test("outerHeight()", function() {
@@ -205,4 +218,7 @@ test("outerHeight()", function() {
 
 	// Temporarily require 0 for backwards compat - should be auto
 	equals( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
+
+	div.remove();
+	jQuery.removeData($div[0], 'olddisplay', true);
 });
diff --git a/test/unit/effects.js b/test/unit/effects.js
index cf9d13109..b1dd28840 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1,4 +1,4 @@
-module("effects");
+module("effects", { teardown: moduleTeardown });
 
 test("sanity check", function() {
 	expect(1);
@@ -14,7 +14,7 @@ test("show()", function() {
 
 	equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
 
-	var div = jQuery("<div>").hide().appendTo("body").show();
+	var div = jQuery("<div>").hide().appendTo("#main").show();
 
 	equal( div.css("display"), "block", "Make sure pre-hidden divs show" );
 
@@ -403,13 +403,16 @@ test("animate duration 0", function() {
 	$elem.hide(0, function(){
 		ok(true, "Hide callback with no duration");
 	});
+
+	// manually clean up detached elements
+	$elem.remove();
 });
 
 test("animate hyphenated properties", function(){
 	expect(1);
 	stop();
 
-	jQuery("#nothiddendiv")
+	jQuery("#foo")
 		.css("font-size", 10)
 		.animate({"font-size": 20}, 200, function(){
 			equals( this.style.fontSize, "20px", "The font-size property was animated." );
@@ -433,7 +436,7 @@ test("stop()", function() {
 	expect(3);
 	stop();
 
-	var $foo = jQuery("#nothiddendiv");
+	var $foo = jQuery("#foo");
 	var w = 0;
 	$foo.hide().width(200).width();
 
@@ -446,6 +449,8 @@ test("stop()", function() {
 		nw = $foo.width();
 		notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px");
 		setTimeout(function(){
+			$foo.removeData();
+			$foo.removeData(undefined, true);
 			equals( nw, $foo.width(), "The animation didn't continue" );
 			start();
 		}, 100);
@@ -456,7 +461,7 @@ test("stop() - several in queue", function() {
 	expect(3);
 	stop();
 
-	var $foo = jQuery("#nothiddendivchild");
+	var $foo = jQuery("#foo");
 	var w = 0;
 	$foo.hide().width(200).width();
 
@@ -481,7 +486,7 @@ test("stop(clearQueue)", function() {
 	expect(4);
 	stop();
 
-	var $foo = jQuery("#nothiddendiv");
+	var $foo = jQuery("#foo");
 	var w = 0;
 	$foo.hide().width(200).width();
 
@@ -508,7 +513,7 @@ test("stop(clearQueue, gotoEnd)", function() {
 	expect(1);
 	stop();
 
-	var $foo = jQuery("#nothiddendivchild");
+	var $foo = jQuery("#foo");
 	var w = 0;
 	$foo.hide().width(200).width();
 
@@ -536,7 +541,7 @@ test("stop(clearQueue, gotoEnd)", function() {
 
 test("toggle()", function() {
 	expect(6);
-	var x = jQuery("#nothiddendiv");
+	var x = jQuery("#foo");
 	ok( x.is(":visible"), "is visible" );
 	x.toggle();
 	ok( x.is(":hidden"), "is hidden" );
@@ -737,6 +742,9 @@ jQuery.each( {
 					}
 				}
 
+				// manually remove generated element
+				jQuery(this).remove();
+
 				start();
 			});
 		});
@@ -763,6 +771,10 @@ jQuery.checkState = function(){
 		var cur = self.style[ c ] || jQuery.css(self, c);
 		equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
 	});
+
+	// manually clean data on modified element
+	jQuery.removeData(this, 'olddisplay', true);
+
 	start();
 }
 
@@ -829,9 +841,6 @@ jQuery.makeTest = function( text ){
 	jQuery("<h4></h4>")
 		.text( text )
 		.appendTo("#fx-tests")
-		.click(function(){
-			jQuery(this).next().toggle();
-		})
 		.after( elem );
 
 	return elem;
diff --git a/test/unit/event.js b/test/unit/event.js
index cae1a83fe..a6d8cb68b 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1,4 +1,4 @@
-module("event");
+module("event", { teardown: moduleTeardown });
 
 test("null or undefined handler", function() {
 	expect(2);
@@ -80,6 +80,9 @@ test("bind(), multiple events at once and namespaces", function() {
 	cur = "focusin";
 	div.trigger("focusin.a");
 
+	// manually clean up detached elements
+	div.remove();
+
 	div = jQuery("<div/>").bind("click mouseover", obj, function(e) {
 		equals( e.type, cur, "Verify right multi event was fired." );
 		equals( e.data, obj, "Make sure the data came in correctly." );
@@ -91,6 +94,9 @@ test("bind(), multiple events at once and namespaces", function() {
 	cur = "mouseover";
 	div.trigger("mouseover");
 
+	// manually clean up detached elements
+	div.remove();
+
 	div = jQuery("<div/>").bind("focusin.a focusout.b", function(e) {
 		equals( e.type, cur, "Verify right multi event was fired." );
 	});
@@ -100,6 +106,9 @@ test("bind(), multiple events at once and namespaces", function() {
 
 	cur = "focusout";
 	div.trigger("focusout.b");
+
+	// manually clean up detached elements
+	div.remove();
 });
 
 test("bind(), namespace with special add", function() {
@@ -525,6 +534,9 @@ test("bind(name, false), unbind(name, false)", function() {
 	jQuery("#ap").unbind("click", false);
 	jQuery("#ap").trigger("click");
 	equals( main, 1, "Verify that the trigger happened correctly." );
+
+	// manually clean up events from elements outside the fixture
+	jQuery("#main").unbind("click");
 });
 
 test("bind()/trigger()/unbind() on plain object", function() {
@@ -663,13 +675,18 @@ test("hover()", function() {
 
 test("trigger() shortcuts", function() {
 	expect(6);
-	jQuery('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
+
+	var elem = jQuery('<li><a href="#">Change location</a></li>').prependTo('#firstUL');
+	elem.find('a').bind('click', function() {
 		var close = jQuery('spanx', this); // same with jQuery(this).find('span');
 		equals( close.length, 0, "Context element does not exist, length must be zero" );
 		ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
 		return false;
 	}).click();
 
+	// manually clean up detached elements
+	elem.remove();
+
 	jQuery("#check1").click(function() {
 		ok( true, "click event handler for checkbox gets fired twice, see #815" );
 	}).click();
@@ -688,9 +705,12 @@ test("trigger() shortcuts", function() {
 	jQuery('#simon1').click();
 	equals( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" );
 
-	jQuery('<img />').load(function(){
+	elem = jQuery('<img />').load(function(){
 		ok( true, "Trigger the load event, using the shortcut .load() (#2819)");
 	}).load();
+
+	// manually clean up detached elements
+	elem.remove();
 });
 
 test("trigger() bubbling", function() {
@@ -725,6 +745,10 @@ test("trigger() bubbling", function() {
 	equals( body, 2, "ap bubble" );
 	equals( main, 1, "ap bubble" );
 	equals( ap, 1, "ap bubble" );
+
+	// manually clean up events from elements outside the fixture
+	jQuery(document).unbind("click");
+	jQuery("html, body, #main").unbind("click");
 });
 
 test("trigger(type, [data], [fn])", function() {
@@ -768,7 +792,7 @@ test("trigger(type, [data], [fn])", function() {
 
 	pass = true;
 	try {
-		jQuery('table:first').bind('test:test', function(){}).trigger('test:test');
+		jQuery('#main table:first').bind('test:test', function(){}).trigger('test:test');
 	} catch (e) {
 		pass = false;
 	}
@@ -952,6 +976,9 @@ test("toggle(Function, Function, ...)", function() {
 	var data = jQuery._data( $div[0], 'events' );
 	ok( !data, "Unbinding one function from toggle unbinds them all");
 
+	// manually clean up detached elements
+	$div.remove();
+
 	// Test Multi-Toggles
 	var a = [], b = [];
 	$div = jQuery("<div/>");
@@ -967,6 +994,9 @@ test("toggle(Function, Function, ...)", function() {
 	$div.click();
 	same( a, [1,2,1], "Check that a click worked with a second toggle, second click." );
 	same( b, [1,2], "Check that a click worked with a second toggle, second click." );
+
+	// manually clean up detached elements
+	$div.remove();
 });
 
 test(".live()/.die()", function() {
@@ -1277,6 +1307,9 @@ test("live with multiple events", function(){
 	div.trigger("submit");
 
 	equals( count, 2, "Make sure both the click and submit were triggered." );
+
+	// manually clean up events from elements outside the fixture
+	div.die();
 });
 
 test("live with namespaces", function(){
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index e273cf08a..de841445f 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -1,4 +1,4 @@
-module("manipulation");
+module("manipulation", { teardown: moduleTeardown });
 
 // Ensure that an extended Array prototype doesn't break jQuery
 Array.prototype.arrayProtoFn = function(arg) { throw("arrayProtoFn should not be called"); };
@@ -115,12 +115,19 @@ var testWrap = function(val) {
 	// Wrap an element with a jQuery set and event
 	result = jQuery("<div></div>").click(function(){
 		ok(true, "Event triggered.");
+
+		// Remove handlers on detached elements
+		result.unbind();
+		jQuery(this).unbind();
 	});
 
 	j = jQuery("<span/>").wrap(result);
 	equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
 
 	j.parent().trigger("click");
+
+	// clean up attached elements
+	QUnit.reset();
 }
 
 test("wrap(String|Element)", function() {
@@ -408,8 +415,12 @@ test("append the same fragment with events (Bug #6997, 5566)", function () {
 			ok(true, "Event exists on original after being unbound on clone");
 			jQuery(this).unbind('click');
 		});
-		element.clone(true).unbind('click')[0].fireEvent('onclick');
+		var clone = element.clone(true).unbind('click');
+		clone[0].fireEvent('onclick');
 		element[0].fireEvent('onclick');
+
+		// manually clean up detached elements
+		clone.remove();
 	}
 
 	element = jQuery("<a class='test6997'></a>").click(function () {
@@ -894,20 +905,36 @@ test("clone()", function() {
 		ok( true, "Bound event still exists." );
 	});
 
-	div = div.clone(true).clone(true);
+	clone = div.clone(true);
+
+	// manually clean up detached elements
+	div.remove();
+
+	div = clone.clone(true);
+
+	// manually clean up detached elements
+	clone.remove();
+
 	equals( div.length, 1, "One element cloned" );
 	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 	div.trigger("click");
 
+	// manually clean up detached elements
+	div.remove();
+
 	div = jQuery("<div/>").append([ document.createElement("table"), document.createElement("table") ]);
 	div.find("table").click(function(){
 		ok( true, "Bound event still exists." );
 	});
 
-	div = div.clone(true);
-	equals( div.length, 1, "One element cloned" );
-	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
-	div.find("table:last").trigger("click");
+	clone = div.clone(true);
+	equals( clone.length, 1, "One element cloned" );
+	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+	clone.find("table:last").trigger("click");
+
+	// manually clean up detached elements
+	div.remove();
+	clone.remove();
 
 	// this is technically an invalid object, but because of the special
 	// classid instantiation it is the only kind that IE has trouble with,
@@ -928,12 +955,16 @@ test("clone()", function() {
 	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 
 	div = jQuery("<div/>").data({ a: true });
-	var div2 = div.clone(true);
-	equals( div2.data("a"), true, "Data cloned." );
-	div2.data("a", false);
-	equals( div2.data("a"), false, "Ensure cloned element data object was correctly modified" );
+	clone = div.clone(true);
+	equals( clone.data("a"), true, "Data cloned." );
+	clone.data("a", false);
+	equals( clone.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" );
 
+	// manually clean up detached elements
+	div.remove();
+	clone.remove();
+
 	var form = document.createElement("form");
 	form.action = "/test/";
 	var div = document.createElement("div");
@@ -1141,15 +1172,21 @@ var testRemove = function(method) {
 	jQuery("#nonnodes").contents()[method]();
 	equals( jQuery("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );
 
+	// manually clean up detached elements
+	if (method === "detach") {
+		first.remove();
+	}
+
 	QUnit.reset();
 
 	var count = 0;
 	var first = jQuery("#ap").children(":first");
-	var cleanUp = first.click(function() { count++ })[method]().appendTo("body").click();
+	var cleanUp = first.click(function() { count++ })[method]().appendTo("#main").click();
 
 	equals( method == "remove" ? 0 : 1, count );
 
-	cleanUp.detach();
+	// manually clean up detached elements
+	cleanUp.remove();
 };
 
 test("remove()", function() {
diff --git a/test/unit/offset.js b/test/unit/offset.js
index cfa14449b..329d69f95 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -1,4 +1,4 @@
-module("offset");
+module("offset", { teardown: moduleTeardown });
 
 test("disconnected node", function() {
 	expect(2);
diff --git a/test/unit/queue.js b/test/unit/queue.js
index eada0eede..31e587db2 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -1,4 +1,4 @@
-module("queue");
+module("queue", { teardown: moduleTeardown });
 
 test("queue() with other types",function() {
 	expect(9);
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 5b758c101..c530c1fdb 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,4 +1,4 @@
-module("selector");
+module("selector", { teardown: moduleTeardown });
 
 test("element", function() {
 	expect(21);
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 31cffc2eb..f0471d74e 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -1,4 +1,4 @@
-module("traversing");
+module("traversing", { teardown: moduleTeardown });
 
 test("find(String)", function() {
 	expect(5);
-- 
cgit v1.2.3


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

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

(limited to 'test')

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();
 
-- 
cgit v1.2.3


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: 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(-)

(limited to 'test')

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);
-- 
cgit v1.2.3


From 9bd9d270f69582b119b1835da4419a900f975b6b Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Mon, 10 Jan 2011 13:17:08 -0500
Subject: whitespace fixes in unit tests

---
 test/unit/css.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/unit/css.js b/test/unit/css.js
index edc340ceb..3e65b5131 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -322,23 +322,23 @@ test(":visible selector works properly on children with a hidden parent (bug #45
 });
 
 test("internal ref to elem.runtimeStyle (bug #7608)", function () {
-  expect(1);
-  
-  var result = true, 
-      val = 10;
-
-  jQuery('<div id="bug7608" style="width:200px;border:solid 1px red;">' +
-    '<div  id="test" style="width:0%; background:#000;">&nbsp;</div></div>').appendTo("body");
-    
-  try {
-	// the bug is located within src/css.js
-    jQuery("#bug7608 #test").animate( { width: val }, 1000);    
-    
-  } catch (e) {
-    result = false;  
-  }
-  
-  ok( result, "elem.runtimeStyle does not throw exception" );
+	expect(1);
+
+	var result = true,
+	val = 10;
+	
+	jQuery('<div id="bug7608" style="width:200px;border:solid 1px red;">' +
+    '<div  id="test" style="width:0%; background:#000;">&nbsp;</div></div>').appendTo("#main");
+
+	try {
+		// the bug is located within src/css.js
+		jQuery("#bug7608 #test").animate( { width: val }, 1000);
+
+	} catch (e) {
+		result = false;
+	}
+
+	ok( result, "elem.runtimeStyle does not throw exception" );
   
-  jQuery("#bug7608").remove();
+	jQuery("#bug7608").remove();
 });
-- 
cgit v1.2.3


From 5a721cf31b142365954a2d71e860534da4536b16 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 11 Jan 2011 20:02:33 +0100
Subject: 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(-)

(limited to 'test')

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();
-- 
cgit v1.2.3


From 6504d4f7005c99ea4064068f3d712322a064b97a Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 11 Jan 2011 23:01:18 +0100
Subject: 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(+)

(limited to 'test')

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 );
-- 
cgit v1.2.3


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

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

(limited to 'test')

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();
 			}
 		}
-	})
+	});
 
 });
 
-- 
cgit v1.2.3


From 0c51e9d55f39366cab14719b80cb7e989c716351 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 12 Jan 2011 18:36:00 +0100
Subject: 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(-)

(limited to 'test')

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",
-- 
cgit v1.2.3


From 44fc87f66ca54278e37f15885a80c2407036df57 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Jan 2011 17:01:25 +0100
Subject: 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(+)

(limited to 'test')

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
-- 
cgit v1.2.3


From d483ce0a9c8b19dafa70be93ca071673b86a65e2 Mon Sep 17 00:00:00 2001
From: Jared Grippe <jared@deadlyicon.com>
Date: Sat, 9 Oct 2010 17:32:54 -0700
Subject: added jQuery.subclass

---
 src/core.js       | 31 ++++++++++++++++++++----
 test/unit/core.js | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/src/core.js b/src/core.js
index 4361577e2..0bf0cb4b7 100644
--- a/src/core.js
+++ b/src/core.js
@@ -3,7 +3,7 @@ var jQuery = (function() {
 // Define a local copy of jQuery
 var jQuery = function( selector, context ) {
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
+		return new jQuery.fn.init( selector, context, rootjQuery );
 	},
 
 	// Map over jQuery in case of overwrite
@@ -78,7 +78,8 @@ var jQuery = function( selector, context ) {
 	class2type = {};
 
 jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
 		var match, elem, ret, doc;
 
 		// Handle $(""), $(null), or $(undefined)
@@ -112,6 +113,7 @@ jQuery.fn = jQuery.prototype = {
 
 				// HANDLE: $(html) -> $(array)
 				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
 					doc = (context ? context.ownerDocument || context : document);
 
 					// If a single string is passed in and it's a single tag
@@ -171,7 +173,7 @@ jQuery.fn = jQuery.prototype = {
 			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(context).find(expr)
 			} else {
-				return jQuery( context ).find( selector );
+				return this.constructor( context ).find( selector );
 			}
 
 		// HANDLE: $(function)
@@ -222,7 +224,7 @@ jQuery.fn = jQuery.prototype = {
 	// (returning the new matched element set)
 	pushStack: function( elems, name, selector ) {
 		// Build a new jQuery matched element set
-		var ret = jQuery();
+		var ret = this.constructor();
 
 		if ( jQuery.isArray( elems ) ) {
 			push.apply( ret, elems );
@@ -287,7 +289,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	end: function() {
-		return this.prevObject || jQuery(null);
+		return this.prevObject || this.constructor(null);
 	},
 
 	// For internal use only.
@@ -960,6 +962,25 @@ jQuery.extend({
 		return { browser: match[1] || "", version: match[2] || "0" };
 	},
 
+	subclass: function(){
+		function jQuerySubclass( selector, context ) {
+			return new jQuerySubclass.fn.init( selector, context );
+		}
+		jQuerySubclass.superclass = this;
+		jQuerySubclass.fn = jQuerySubclass.prototype = this();
+		jQuerySubclass.fn.constructor = jQuerySubclass;
+		jQuerySubclass.subclass = this.subclass;
+		jQuerySubclass.fn.init = function init( selector, context ) {
+			if (context && context instanceof jQuery && !(context instanceof jQuerySubclass)){
+				context = jQuerySubclass(context);
+			}
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass );
+		};
+		jQuerySubclass.fn.init.prototype = jQuerySubclass.fn;
+		var rootjQuerySubclass = jQuerySubclass(document);
+		return jQuerySubclass;
+	},
+
 	browser: {}
 });
 
diff --git a/test/unit/core.js b/test/unit/core.js
index bfb2f1cf4..d26e7c56d 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1063,3 +1063,75 @@ test("jQuery.when()", function() {
 		});
 	}
 });
+
+test("jQuery.subclass", function(){
+	expect(378);
+
+	var Subclass = jQuery.subclass(),
+			SubclassSubclass = Subclass.subclass(),
+			jQueryDocument = jQuery(document),
+			selectors, contexts, methods, method, arg, description;
+
+	jQueryDocument.toString = function(){ return 'jQueryDocument'; };
+
+	Subclass.fn.subclassMethod = function(){};
+	SubclassSubclass.fn.subclassSubclassMethod = function(){};
+
+	selectors = [
+		'body',
+		'html, body',
+		'<div></div>'
+	]
+
+	methods = [ // all methods that return a new jQuery instance
+		['eq', 1],
+		['add', document],
+		['end'],
+		['has'],
+		['closest', 'div'],
+		['filter', document],
+		['find']
+	]
+
+	contexts = [undefined, document, jQueryDocument];
+
+	jQuery.each(selectors, function(i, selector){
+
+		jQuery.each(methods, function(){
+			method = this[0]
+			arg = this[1]
+
+			jQuery.each(contexts, function(i, context){
+
+				description = '("'+selector+'", '+context+').'+method+'('+(arg||'')+')';
+
+				same(
+					jQuery(selector, context)[method](arg).subclassMethod, undefined,
+					'jQuery'+description+' doesnt have Subclass methods'
+				);
+				same(
+					jQuery(selector, context)[method](arg).subclassSubclassMethod, undefined,
+					'jQuery'+description+' doesnt have SubclassSubclass methods'
+				);
+				same(
+					Subclass(selector, context)[method](arg).subclassMethod, Subclass.fn.subclassMethod,
+					'Subclass'+description+' has Subclass methods'
+				);
+				same(
+					Subclass(selector, context)[method](arg).subclassSubclassMethod, undefined,
+					'Subclass'+description+' doesnt have SubclassSubclass methods'
+				);
+				same(
+					SubclassSubclass(selector, context)[method](arg).subclassMethod, Subclass.fn.subclassMethod,
+					'SubclassSubclass'+description+' has Subclass methods'
+				);
+				same(
+					SubclassSubclass(selector, context)[method](arg).subclassSubclassMethod, SubclassSubclass.fn.subclassSubclassMethod,
+					'SubclassSubclass'+description+' has SubclassSubclass methods'
+				);
+
+			});
+		});
+	});
+
+});
-- 
cgit v1.2.3


From 3716f2d0416895e1220269ea2e8bb23b8b843db0 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 14 Jan 2011 10:36:45 -0500
Subject: Overwrite CRLF with LF

---
 test/delegatetest.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test')

diff --git a/test/delegatetest.html b/test/delegatetest.html
index 6479d26ec..efc206814 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -229,14 +229,22 @@
 	$(document).bind("change", function(){
 		jQuery("#boundChange").blink();
 	});
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> Overwrite CRLF with LF
 	$("#text_submit").addSubmitTest("#textSubmit", true);
 	$("#password_submit").addSubmitTest("#passwordSubmit", true);
 	$("#submit_submit").addSubmitTest("#submitSubmit", true);
 	$(document).bind("submit", function(){
 		jQuery("#boundSubmit").blink();
 	});
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> Overwrite CRLF with LF
         </script>
     </body>
 </html>
-- 
cgit v1.2.3


From fa45f25d1c554663f696c43bb1d08d24fec6abf5 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 14 Jan 2011 11:17:32 -0500
Subject: Fix a failing subclass test due to a change in master

---
 test/unit/core.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/unit/core.js b/test/unit/core.js
index d26e7c56d..db160b2d6 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1081,7 +1081,7 @@ test("jQuery.subclass", function(){
 		'body',
 		'html, body',
 		'<div></div>'
-	]
+	];
 
 	methods = [ // all methods that return a new jQuery instance
 		['eq', 1],
@@ -1090,16 +1090,16 @@ test("jQuery.subclass", function(){
 		['has'],
 		['closest', 'div'],
 		['filter', document],
-		['find']
-	]
+		['find', 'div']
+	];
 
 	contexts = [undefined, document, jQueryDocument];
 
 	jQuery.each(selectors, function(i, selector){
 
 		jQuery.each(methods, function(){
-			method = this[0]
-			arg = this[1]
+			method = this[0];
+			arg = this[1];
 
 			jQuery.each(contexts, function(i, context){
 
-- 
cgit v1.2.3


From f4add19759678797ed8078a96d0c18b168df8588 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 14 Jan 2011 12:46:14 -0500
Subject: So embarrassing :(

---
 test/delegatetest.html | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'test')

diff --git a/test/delegatetest.html b/test/delegatetest.html
index efc206814..6479d26ec 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -229,22 +229,14 @@
 	$(document).bind("change", function(){
 		jQuery("#boundChange").blink();
 	});
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> Overwrite CRLF with LF
 	$("#text_submit").addSubmitTest("#textSubmit", true);
 	$("#password_submit").addSubmitTest("#passwordSubmit", true);
 	$("#submit_submit").addSubmitTest("#submitSubmit", true);
 	$(document).bind("submit", function(){
 		jQuery("#boundSubmit").blink();
 	});
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> Overwrite CRLF with LF
         </script>
     </body>
 </html>
-- 
cgit v1.2.3


From 007e2d152e10a8feffa347b5f328d2cb4bd45327 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Sat, 15 Jan 2011 10:24:13 -0500
Subject: Update test case to feature-detect Opera's lack of defaultPrevented
 and skip the test for it.

---
 test/unit/event.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/unit/event.js b/test/unit/event.js
index 56bc64ff6..d5d6790d4 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -314,7 +314,14 @@ test("bind/delegate bubbling, isDefaultPrevented", function() {
 		e.preventDefault();
 	});
 	$main.delegate("#foo", "click", function(e) {
-		equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" );
+		var orig = e.originalEvent;
+		if ( typeof(orig.defaultPrevented) === "boolean" || typeof(orig.returnValue) === "boolean" || orig.getPreventDefault ) {
+			equals( e.isDefaultPrevented(), true, "isDefaultPrevented true passed to bubbled event" );
+		}
+		else {
+			// Opera < 11 doesn't implement any interface we can use, so give it a pass
+			ok( true, "isDefaultPrevented not supported by this browser, test skipped" );
+		}
 	});
 	fakeClick( $anchor2 );
 	$anchor2.unbind( "click" );
-- 
cgit v1.2.3


From 8ab23aec2c333834a6e442fa15b73125ba857afe Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 16 Jan 2011 02:57:39 +0100
Subject: Fixes #2994. Not finding a transport now fires the error callbacks
 and doesn't make ajax return false. Had to revise how jsonp and script
 prefilters & transports work (better separation of concerns). Also took the
 opportunity to revise jXHR getRequestHeader and abort methods and enabled
 early transport garbage collection when the request completes.

---
 src/ajax.js        | 142 +++++++++++++++++++++++++++++------------------------
 src/ajax/jsonp.js  |  71 ++++++++++++---------------
 src/ajax/script.js |  16 +++---
 test/unit/ajax.js  |  16 ++----
 4 files changed, 123 insertions(+), 122 deletions(-)

(limited to 'test')

diff --git a/src/ajax.js b/src/ajax.js
index 645163ad2..5c4d469fd 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -306,30 +306,35 @@ jQuery.extend({
 				// (match is used internally)
 				getResponseHeader: function( key , match ) {
 
-					if ( state !== 2 ) {
-						return null;
-					}
+					if ( state === 2 ) {
 
-					if ( responseHeaders === undefined ) {
+						if ( responseHeaders === undefined ) {
 
-						responseHeaders = {};
+							responseHeaders = {};
 
-						if ( typeof responseHeadersString === "string" ) {
+							if ( typeof responseHeadersString === "string" ) {
 
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+								while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+									responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+								}
 							}
 						}
+						match = responseHeaders[ key.toLowerCase() ];
+
+					} else {
+
+						match = null;
 					}
-					return responseHeaders[ key.toLowerCase() ];
+
+					return match;
 				},
 
 				// Cancel the request
 				abort: function( statusText ) {
-					if ( transport && state !== 2 ) {
+					if ( transport ) {
 						transport.abort( statusText || "abort" );
-						done( 0 , statusText );
 					}
+					done( 0 , statusText );
 					return this;
 				}
 			};
@@ -347,6 +352,10 @@ jQuery.extend({
 			// State is "done" now
 			state = 2;
 
+			// Dereference transport for early garbage collection
+			// (no matter how long the jXHR transport will be used
+			transport = 0;
+
 			// Set readyState
 			jXHR.readyState = status ? 4 : 0;
 
@@ -599,84 +608,87 @@ jQuery.extend({
 			s.data = jQuery.param( s.data , s.traditional );
 		}
 
-		// Get transport
-		transport = jQuery.ajaxPrefilter( s , options ).ajaxTransport( s );
+		// Apply prefilters
+		jQuery.ajaxPrefilter( s , options );
 
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
 
-		// If no transport, we auto-abort
-		if ( ! transport ) {
-
-			done( 0 , "transport not found" );
-			jXHR = false;
+		// More options handling for requests with no content
+		if ( ! s.hasContent ) {
 
-		} else {
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+			}
 
-			// More options handling for requests with no content
-			if ( ! s.hasContent ) {
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
 
-				// If data is available, append data to url
-				if ( s.data ) {
-					s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-				}
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts , "$1_=" + ts );
 
-				// Add anti-cache in url if needed
-				if ( s.cache === false ) {
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
+			}
+		}
 
-					var ts = jQuery.now(),
-						// try replacing _= if it is there
-						ret = s.url.replace( rts , "$1_=" + ts );
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			requestHeaders[ "content-type" ] = s.contentType;
+		}
 
-					// if nothing was replaced, add timestamp to the end
-					s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
-				}
+		// 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 ];
 			}
-
-			// Set the correct header, if data is being sent
-			if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-				requestHeaders[ "content-type" ] = s.contentType;
+			if ( jQuery_etag[ s.url ] ) {
+				requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
 			}
+		}
 
-			// 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 ];
+		}
 
-			// 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[ "*" ];
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
 
-			// Check for headers option
-			for ( i in s.headers ) {
-				requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
+				// Abort if not done already
+				done( 0 , "abort" );
+
+				// Return false
+				jXHR = false;
+
+		} else {
+
+			// Install callbacks on deferreds
+			for ( i in { success:1, error:1, complete:1 } ) {
+				jXHR[ i ]( s[ i ] );
 			}
 
-			// Allow custom headers/mimetypes and early abort
-			if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
+			// Get transport
+			transport = jQuery.ajaxTransport( s );
 
-					// Abort if not done already
-					done( 0 , "abort" );
-					jXHR = false;
+			// If no transport, we auto-abort
+			if ( ! transport ) {
+
+				done( 0 , "notransport" );
 
 			} 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 ] );
-				}
+				state = jXHR.readyState = 1;
 
 				// Send global event
 				if ( s.global ) {
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 1df5dd427..675ecc085 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -11,9 +11,7 @@ jQuery.ajaxSetup({
 		return "jsonp" + jsc++;
 	}
 
-// Normalize jsonp queries
-// 1) put callback parameter in url or data
-// 2) sneakily ensure transportDataType is always jsonp for jsonp requests
+// Detect, normalize options and install callbacks for jsonp requests
 }).ajaxPrefilter("json jsonp", function(s, originalSettings) {
 
 	if ( s.dataTypes[ 0 ] === "jsonp" ||
@@ -22,8 +20,10 @@ jQuery.ajaxSetup({
 		jsre.test(s.url) ||
 		typeof(s.data) === "string" && jsre.test(s.data) ) {
 
-		var jsonpCallback = s.jsonpCallback =
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
 				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
 			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;
 
@@ -33,51 +33,42 @@ jQuery.ajaxSetup({
 
 		s.url = url;
 		s.data = data;
-		s.dataTypes[ 0 ] = "jsonp";
-	}
-
-// Bind transport to jsonp dataType
-}).ajaxTransport("jsonp", function(s) {
 
-	// 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] );
+			// 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){}
 			}
-		} else {
-			// else, more memory leak avoidance
-			try{ delete window[ jsonpCallback ]; } catch(e){}
-		}
 
-	}, s.complete ];
+		}, s.complete ];
 
-	// Sneakily ensure this will be handled as json
-	s.dataTypes[ 0 ] = "json";
+		// 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 ];
+		};
 
-	// 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 ];
-	};
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
 
-	// Delegate to script transport
-	return "script";
+		// Delegate to script
+		return "script";
+	}
 });
 
 })( jQuery );
diff --git a/src/ajax/script.js b/src/ajax/script.js
index 8e2e89ac5..ee1d489eb 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -15,18 +15,22 @@ jQuery.ajaxSetup({
 		"text script": jQuery.globalEval
 	}
 
-// Bind script tag hack transport
-}).ajaxTransport("script", function(s) {
+// Handle cache's special case and global
+}).ajaxPrefilter("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 ) ) {
-
+	if ( s.crossDomain ) {
 		s.global = false;
+	}
+
+// Bind script tag hack transport
+}).ajaxTransport("script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
 
 		var script,
 			head = document.getElementsByTagName("head")[0] || document.documentElement;
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index f5b71da39..49196cbbb 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1865,25 +1865,19 @@ test("jQuery ajax - failing cross-domain", function() {
 
 	var i = 2;
 
-	if ( jQuery.ajax({
+	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();
-	}
+	});
 
-	if ( jQuery.ajax({
+	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();
-	}
+	});
 
 });
 
@@ -1937,7 +1931,7 @@ test( "jQuery.ajax - statusCode" , function() {
 			404: function() {
 				ok( ! isSuccess , name );
 			}
-		}
+		};
 	}
 
 	jQuery.each( {
-- 
cgit v1.2.3


From 0e93b2e24c67237c1172b5d7b1f75f52904d6a1c Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 16 Jan 2011 05:27:16 +0100
Subject: Revised jsonp unit tests and added a test for when the jsonp option
 is set to false.

---
 test/unit/ajax.js | 481 +++++++++++++++++++++++++-----------------------------
 1 file changed, 222 insertions(+), 259 deletions(-)

(limited to 'test')

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 49196cbbb..2e8a455eb 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1114,286 +1114,249 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 	});
 });
 
-test("jQuery.ajax() - JSONP, Local", function() {
-	expect(14);
-
-	var count = 0;
-	function plus(){ if ( ++count == 14 ) start(); }
+jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
 
-	stop();
+	test("jQuery.ajax() - JSONP, " + label, function() {
+		expect(16);
 
-	jQuery.ajax({
-		url: "data/jsonp.php",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, no callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, no callback)" );
-			plus();
-		}
-	});
-
-	jQuery.ajax({
-		url: "data/jsonp.php?callback=?",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, url callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, url callback)" );
-			plus();
-		}
-	});
-
-	jQuery.ajax({
-		url: "data/jsonp.php",
-		dataType: "jsonp",
-		data: "callback=?",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, data callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, data callback)" );
-			plus();
-		}
-	});
+		var count = 0;
+		function plus(){ if ( ++count == 16 ) start(); }
 
-	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();
-		}
-	});
+		stop();
 
-	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",
+			crossDomain: crossDomain,
+			success: function(data){
+				ok( data.data, "JSON results returned (GET, no callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, no 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?callback=?",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			success: function(data){
+				ok( data.data, "JSON results returned (GET, url callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, url callback)" );
+				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",
+			crossDomain: crossDomain,
+			data: "callback=?",
+			success: function(data){
+				ok( data.data, "JSON results returned (GET, data callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, data callback)" );
+				plus();
+			}
+		});
 
-	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?callback=??",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			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",
-		jsonp: "callback",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, data obj callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, data obj callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			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",
-		jsonpCallback: "jsonpResults",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, custom callback name)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, custom callback name)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php/??",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			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({
-		type: "POST",
-		url: "data/jsonp.php",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (POST, no callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, data obj callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php/???json=1",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			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({
-		type: "POST",
-		url: "data/jsonp.php",
-		data: "callback=?",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (POST, data callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (POST, data callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			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({
-		type: "POST",
-		url: "data/jsonp.php",
-		jsonp: "callback",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (POST, data obj callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (POST, data obj callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			jsonp: "callback",
+			success: function(data){
+				ok( data.data, "JSON results returned (GET, data obj callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, data obj callback)" );
+				plus();
+			}
+		});
 
-	//#7578
-	jQuery.ajax({
-		url: "data/jsonp.php",
-		dataType: "jsonp",
-		beforeSend: function(){
-			strictEqual( this.cache, false, "cache must be false on JSON request" );
+		window.jsonpResults = function(data) {
+			ok( data.data, "JSON results returned (GET, custom callback function)" );
+			window.jsonpResults = undefined;
 			plus();
-			return false;
-		}
-	});
-});
-
-test("jQuery.ajax() - JSONP - Custom JSONP Callback", function() {
-	expect(1);
-	stop();
-
-	window.jsonpResults = function(data) {
-		ok( data.data, "JSON results returned (GET, custom callback function)" );
-		window.jsonpResults = undefined;
-		start();
-	};
-
-	jQuery.ajax({
-		url: "data/jsonp.php",
-		dataType: "jsonp",
-		jsonpCallback: "jsonpResults"
-	});
-});
-
-test("jQuery.ajax() - JSONP, Remote", function() {
-	expect(4);
+		};
 
-	var count = 0;
-	function plus(){ if ( ++count == 4 ) start(); }
+		jQuery.ajax({
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			jsonpCallback: "jsonpResults",
+			success: function(data){
+				ok( data.data, "JSON results returned (GET, custom callback name)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, custom callback name)" );
+				plus();
+			}
+		});
 
-	var base = window.location.href.replace(/[^\/]*$/, "");
+		jQuery.ajax({
+			type: "POST",
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			success: function(data){
+				ok( data.data, "JSON results returned (POST, no callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (GET, data obj callback)" );
+				plus();
+			}
+		});
 
-	stop();
+		jQuery.ajax({
+			type: "POST",
+			url: "data/jsonp.php",
+			data: "callback=?",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			success: function(data){
+				ok( data.data, "JSON results returned (POST, data callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (POST, data callback)" );
+				plus();
+			}
+		});
 
-	jQuery.ajax({
-		url: base + "data/jsonp.php",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, no callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, no callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			type: "POST",
+			url: "data/jsonp.php",
+			jsonp: "callback",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			success: function(data){
+				ok( data.data, "JSON results returned (POST, data obj callback)" );
+				plus();
+			},
+			error: function(data){
+				ok( false, "Ajax error JSON (POST, data obj callback)" );
+				plus();
+			}
+		});
 
-	jQuery.ajax({
-		url: base + "data/jsonp.php?callback=?",
-		dataType: "jsonp",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, url callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, url callback)" );
-			plus();
-		}
-	});
+		//#7578
+		jQuery.ajax({
+			url: "data/jsonp.php",
+			dataType: "jsonp",
+			crossDomain: crossDomain,
+			beforeSend: function(){
+				strictEqual( this.cache, false, "cache must be false on JSON request" );
+				plus();
+				return false;
+			}
+		});
 
-	jQuery.ajax({
-		url: base + "data/jsonp.php",
-		dataType: "jsonp",
-		data: "callback=?",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, data callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, data callback)" );
-			plus();
-		}
-	});
+		jQuery.ajax({
+			url: "data/jsonp.php?callback=XXX",
+			dataType: "jsonp",
+			jsonp: false,
+			jsonpCallback: "XXX",
+			crossDomain: crossDomain,
+			beforeSend: function() {
+				console.log( this.url );
+			},
+			success: function(data){
+				console.log(data);
+				ok( data.data, "JSON results returned (GET, custom callback name with no url manipulation)" );
+				plus();
+			},
+			error: function(data){
+				console.log(data);
+				ok( false, "Ajax error JSON (GET, custom callback name with no url manipulation)" );
+				plus();
+			}
+		});
 
-	jQuery.ajax({
-		url: base + "data/jsonp.php",
-		dataType: "jsonp",
-		jsonp: "callback",
-		success: function(data){
-			ok( data.data, "JSON results returned (GET, data obj callback)" );
-			plus();
-		},
-		error: function(data){
-			ok( false, "Ajax error JSON (GET, data obj callback)" );
-			plus();
-		}
 	});
 });
 
-- 
cgit v1.2.3


From cfca6d3836476a233cf349abc5f433f1ba7b8feb Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 16 Jan 2011 05:36:20 +0100
Subject: Fixed the ajax test regarding the jsonp option set to false and added
 a test to control the prefilter actually does not tamper with the url.

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

(limited to 'test')

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 2e8a455eb..f26ebadee 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1117,10 +1117,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
 
 	test("jQuery.ajax() - JSONP, " + label, function() {
-		expect(16);
+		expect(17);
 
 		var count = 0;
-		function plus(){ if ( ++count == 16 ) start(); }
+		function plus(){ if ( ++count == 17 ) start(); }
 
 		stop();
 
@@ -1343,15 +1343,15 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
 			jsonpCallback: "XXX",
 			crossDomain: crossDomain,
 			beforeSend: function() {
-				console.log( this.url );
+				ok( /^data\/jsonp.php\?callback=XXX&_=\d+$/.test( this.url ) ,
+					"The URL wasn't messed with (GET, custom callback name with no url manipulation)" );
+				plus();
 			},
 			success: function(data){
-				console.log(data);
 				ok( data.data, "JSON results returned (GET, custom callback name with no url manipulation)" );
 				plus();
 			},
 			error: function(data){
-				console.log(data);
 				ok( false, "Ajax error JSON (GET, custom callback name with no url manipulation)" );
 				plus();
 			}
-- 
cgit v1.2.3


From c272f5f7da3473fd5ac85efe783a0d63608ec62b Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Sun, 16 Jan 2011 17:41:39 +0100
Subject: Implements joined jQuery.when statements. Makes it so calling
 jQuery.when with no parameter returns a resolved promise. Ensures promise
 method on promises supports the promise(obj) signature. Ensures a deferred
 and its promise always return the same promise (itself for the promise). Unit
 tests provided.

---
 src/core.js       | 47 ++++++++++++++++++++++++++++++++++++-----------
 test/unit/core.js | 46 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 79 insertions(+), 14 deletions(-)

(limited to 'test')

diff --git a/src/core.js b/src/core.js
index 0bf0cb4b7..25ef22d76 100644
--- a/src/core.js
+++ b/src/core.js
@@ -898,9 +898,10 @@ jQuery.extend({
 	Deferred: function( func ) {
 
 		var deferred = jQuery._Deferred(),
-			failDeferred = jQuery._Deferred();
+			failDeferred = jQuery._Deferred(),
+			promise;
 
-		// Add errorDeferred methods and redefine cancel
+		// Add errorDeferred methods, then and promise
 		jQuery.extend( deferred , {
 
 			then: function( doneCallbacks , failCallbacks ) {
@@ -914,13 +915,15 @@ jQuery.extend({
 			// 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 done fail isResolved isRejected".split( " " ) , function( _ , method ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				jQuery.each( "then done fail isResolved isRejected promise".split( " " ) , function( _ , method ) {
 					obj[ method ] = deferred[ method ];
 				});
-				obj.promise = function() {
-					return obj;
-				};
 				return obj;
 			}
 
@@ -942,10 +945,32 @@ jQuery.extend({
 
 	// Deferred helper
 	when: function( object ) {
-		object = object && jQuery.isFunction( object.promise ) ?
-			object :
-			jQuery.Deferred().resolve( object );
-		return object.promise();
+		var args = arguments,
+			length = args.length,
+			deferred = length <= 1 && object && jQuery.isFunction( object.promise ) ?
+				object :
+				jQuery.Deferred(),
+			promise = deferred.promise(),
+			resolveArray;
+
+		if ( length > 1 ) {
+			resolveArray = new Array( length );
+			jQuery.each( args, function( index, element, args ) {
+				jQuery.when( element ).done( function( value ) {
+					args = arguments;
+					resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
+					if( ! --length ) {
+						deferred.fire( promise, resolveArray );
+					}
+				}).fail( function() {
+					deferred.fireReject( promise, arguments );
+				});
+				return !deferred.isRejected();
+			});
+		} else if ( deferred !== object ) {
+			deferred.resolve( object );
+		}
+		return promise;
 	},
 
 	// Use of jQuery.browser is frowned upon.
diff --git a/test/unit/core.js b/test/unit/core.js
index db160b2d6..8e3756a9c 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -21,7 +21,7 @@ test("jQuery()", function() {
 	equals( jQuery(null).length, 0, "jQuery(null) === jQuery([])" );
 	equals( jQuery("").length, 0, "jQuery('') === jQuery([])" );
 
-	var obj = jQuery("div")
+	var obj = jQuery("div");
 	equals( jQuery(obj).selector, "div", "jQuery(jQueryObj) == jQueryObj" );
 
 		// can actually yield more than one, when iframes are included, the window is an array as well
@@ -1003,7 +1003,7 @@ test("jQuery._Deferred()", function() {
 
 test("jQuery.Deferred()", function() {
 
-	expect( 4 );
+	expect( 6 );
 
 	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
@@ -1023,11 +1023,16 @@ test("jQuery.Deferred()", function() {
 	}, function() {
 		ok( true , "Error on reject" );
 	});
+
+	var tmp = jQuery.Deferred();
+
+	strictEqual( tmp.promise() , tmp.promise() , "Test deferred always return same promise" );
+	strictEqual( tmp.promise() , tmp.promise().promise() , "Test deferred's promise always return same promise as deferred" );
 });
 
 test("jQuery.when()", function() {
 
-	expect( 21 );
+	expect( 23 );
 
 	// Some other objects
 	jQuery.each( {
@@ -1050,6 +1055,10 @@ test("jQuery.when()", function() {
 
 	} );
 
+	ok( jQuery.isFunction( jQuery.when().then( function( resolveValue ) {
+		strictEqual( resolveValue , undefined , "Test the promise was resolved with no parameter" );
+	} ).promise ) , "Test calling when with no parameter triggers the creation of a new Promise" );
+
 	var cache, i;
 
 	for( i = 1 ; i < 4 ; i++ ) {
@@ -1064,6 +1073,37 @@ test("jQuery.when()", function() {
 	}
 });
 
+test("jQuery.when() - joined", function() {
+
+	expect(8);
+
+	jQuery.when( 1, 2, 3 ).done( function( a, b, c ) {
+		strictEqual( a , 1 , "Test first param is first resolved value - non-observables" );
+		strictEqual( b , 2 , "Test second param is second resolved value - non-observables" );
+		strictEqual( c , 3 , "Test third param is third resolved value - non-observables" );
+	}).fail( function() {
+		ok( false , "Test the created deferred was resolved - non-observables");
+	});
+
+	var successDeferred = jQuery.Deferred().resolve( 1 , 2 , 3 ),
+		errorDeferred = jQuery.Deferred().reject( "error" , "errorParam" );
+
+	jQuery.when( 1 , successDeferred , 3 ).done( function( a, b, c ) {
+		strictEqual( a , 1 , "Test first param is first resolved value - resolved observable" );
+		same( b , [ 1 , 2 , 3 ] , "Test second param is second resolved value - resolved observable" );
+		strictEqual( c , 3 , "Test third param is third resolved value - resolved observable" );
+	}).fail( function() {
+		ok( false , "Test the created deferred was resolved - resolved observable");
+	});
+
+	jQuery.when( 1 , errorDeferred , 3 ).done( function() {
+		ok( false , "Test the created deferred was rejected - rejected observable");
+	}).fail( function( error , errorParam ) {
+		strictEqual( error , "error" , "Test first param is first rejected value - rejected observable" );
+		strictEqual( errorParam , "errorParam" , "Test second param is second rejected value - rejected observable" );
+	});
+});
+
 test("jQuery.subclass", function(){
 	expect(378);
 
-- 
cgit v1.2.3


From ac2e731b2d219fd516a166a058831de1ff949d4a Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Mon, 17 Jan 2011 17:52:30 +0100
Subject: Added unit tests to check and demonstrate new jQuery.Deferred()
 works.

---
 test/unit/core.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/unit/core.js b/test/unit/core.js
index 8e3756a9c..88f7609f2 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1003,7 +1003,7 @@ test("jQuery._Deferred()", function() {
 
 test("jQuery.Deferred()", function() {
 
-	expect( 6 );
+	expect( 10 );
 
 	jQuery.Deferred( function( defer ) {
 		strictEqual( this , defer , "Defer passed as this & first argument" );
@@ -1024,6 +1024,25 @@ test("jQuery.Deferred()", function() {
 		ok( true , "Error on reject" );
 	});
 
+	( new jQuery.Deferred( function( defer ) {
+		strictEqual( this , defer , "Defer passed as this & first argument (new)" );
+		this.resolve( "done" );
+	}) ).then( function( value ) {
+		strictEqual( value , "done" , "Passed function executed (new)" );
+	});
+
+	( new jQuery.Deferred() ).resolve().then( function() {
+		ok( true , "Success on resolve (new)" );
+	}, function() {
+		ok( false , "Error on resolve (new)" );
+	});
+
+	( new jQuery.Deferred() ).reject().then( function() {
+		ok( false , "Success on reject (new)" );
+	}, function() {
+		ok( true , "Error on reject (new)" );
+	});
+
 	var tmp = jQuery.Deferred();
 
 	strictEqual( tmp.promise() , tmp.promise() , "Test deferred always return same promise" );
-- 
cgit v1.2.3


From 0c1ffe3cb381430ec501385fcb29dca22a27d816 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Mon, 17 Jan 2011 17:44:42 -0500
Subject: Fixed a couple issues with escaping of attribute values in selectors.
 Fixes #6093.

---
 test/unit/selector.js | 67 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 55 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 5b758c101..27ad6e535 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -58,13 +58,14 @@ if ( location.protocol != "file:" ) {
 }
 
 test("broken", function() {
-	expect(8);
+	expect(20);
+
 	function broken(name, selector) {
 		try {
 			jQuery(selector);
 			ok( false, name + ": " + selector );
 		} catch(e){
-			ok(  typeof e === "string" && e.indexOf("Syntax error") >= 0,
+			ok( typeof e === "string" && e.indexOf("Syntax error") >= 0,
 				name + ": " + selector );
 		}
 	}
@@ -77,10 +78,28 @@ test("broken", function() {
 	broken( "Broken Selector", "<>", [] );
 	broken( "Broken Selector", "{}", [] );
 	broken( "Doesn't exist", ":visble", [] );
+	broken( "Nth-child", ":nth-child", [] );
+	broken( "Nth-child", ":nth-child(-)", [] );
+	broken( "Nth-child", ":nth-child(asdf)", [] );
+	broken( "Nth-child", ":nth-child(2n+-0)", [] );
+	broken( "Nth-child", ":nth-child(2+0)", [] );
+	broken( "Nth-child", ":nth-child(- 1n)", [] );
+	broken( "Nth-child", ":nth-child(-1 n)", [] );
+	broken( "First-child", ":first-child(n)", [] );
+	broken( "Last-child", ":last-child(n)", [] );
+	broken( "Only-child", ":only-child(n)", [] );
+
+	// Make sure attribute value quoting works correctly. See: #6093
+	var attrbad = jQuery('<input type="hidden" value="2" name="foo.baz" id="attrbad1"/><input type="hidden" value="2" name="foo[baz]" id="attrbad2"/>').appendTo("body");
+
+	broken( "Attribute not escaped", "input[name=foo.baz]", [] );
+	broken( "Attribute not escaped", "input[name=foo[baz]]", [] );
+
+	attrbad.remove();
 });
 
 test("id", function() {
-	expect(28);
+	expect(29);
 	t( "ID Selector", "#body", ["body"] );
 	t( "ID Selector w/ Element", "body#body", ["body"] );
 	t( "ID Selector w/ Element", "ul#first", [] );
@@ -116,6 +135,9 @@ test("id", function() {
 
 	same( jQuery("body").find("div#form").get(), [], "ID selector within the context of another element" );
 
+	//#7533
+	equal( jQuery("<div id=\"A'B~C.D[E]\"><p>foo</p></div>").find("p").length, 1, "Find where context root is a node and has an ID with CSS3 meta characters" );
+
 	t( "Underscore ID", "#types_all", ["types_all"] );
 	t( "Dash ID", "#fx-queue", ["fx-queue"] );
 
@@ -150,7 +172,7 @@ test("class", function() {
 	t( "Child escaped Class", "form > .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
 
 	var div = document.createElement("div");
-  div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
 	same( jQuery(".e", div).get(), [ div.firstChild ], "Finding a second class." );
 
 	div.lastChild.className = "e";
@@ -202,7 +224,7 @@ test("multiple", function() {
 });
 
 test("child and adjacent", function() {
-	expect(27);
+	expect(31);
 	t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
@@ -210,20 +232,25 @@ test("child and adjacent", function() {
 	t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
 	t( "All Children", "code > *", ["anchor1","anchor2"] );
 	t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
-	t( "Adjacent", "#main a + a", ["groups"] );
-	t( "Adjacent", "#main a +a", ["groups"] );
-	t( "Adjacent", "#main a+ a", ["groups"] );
-	t( "Adjacent", "#main a+a", ["groups"] );
+	t( "Adjacent", "a + a", ["groups"] );
+	t( "Adjacent", "a +a", ["groups"] );
+	t( "Adjacent", "a+ a", ["groups"] );
+	t( "Adjacent", "a+a", ["groups"] );
 	t( "Adjacent", "p + p", ["ap","en","sap"] );
 	t( "Adjacent", "p#firstp + p", ["ap"] );
 	t( "Adjacent", "p[lang=en] + p", ["sap"] );
 	t( "Adjacent", "a.GROUPS + code + a", ["mark"] );
-	t( "Comma, Child, and Adjacent", "#main a + a, code > a", ["groups","anchor1","anchor2"] );
+	t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
 	t( "Element Preceded By", "p ~ div", ["foo", "moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
 	t( "Element Preceded By", "#first ~ div", ["moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
 	t( "Element Preceded By", "#groups ~ a", ["mark"] );
 	t( "Element Preceded By", "#length ~ input", ["idTest"] );
 	t( "Element Preceded By", "#siblingfirst ~ em", ["siblingnext"] );
+	same( jQuery("#siblingfirst").find("~ em").get(), q("siblingnext"), "Element Preceded By with a context." );
+	same( jQuery("#siblingfirst").find("+ em").get(), q("siblingnext"), "Element Directly Preceded By with a context." );
+	var a = jQuery("<div id='foo'></div><p id='bar'></p><p id='bar2'></p>");
+	same( jQuery("~ p", a[0]).get(), [a[1], a[2]], "Detached Element Directly Preceded By with a context." );
+	same( jQuery("+ p", a[0]).get(), [a[1]], "Detached Element Preceded By with a context." );
 
 	t( "Verify deep class selector", "div.blah > p > a", [] );
 
@@ -237,7 +264,8 @@ test("child and adjacent", function() {
 });
 
 test("attributes", function() {
-	expect(39);
+	expect(41);
+
 	t( "Attribute Exists", "a[title]", ["google"] );
 	t( "Attribute Exists", "*[title]", ["google"] );
 	t( "Attribute Exists", "[title]", ["google"] );
@@ -294,10 +322,18 @@ test("attributes", function() {
 	t("Select options via :selected", "#select3 option:selected", ["option3b", "option3c"] );
 
 	t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
+
+	// Make sure attribute value quoting works correctly. See: #6093
+	var attrbad = jQuery('<input type="hidden" value="2" name="foo.baz" id="attrbad1"/><input type="hidden" value="2" name="foo[baz]" id="attrbad2"/>').appendTo("body");
+
+	t("Find escaped attribute value", "input[name=foo\\.baz]", ["attrbad1"]);
+	t("Find escaped attribute value", "input[name=foo\\[baz\\]]", ["attrbad2"]);
+
+	attrbad.remove();
 });
 
 test("pseudo - child", function() {
-	expect(31);
+	expect(38);
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Only Child", "#main a:only-child", ["simon1","anchor1","yahoo","anchor2","liveLink1","liveLink2"] );
@@ -306,6 +342,7 @@ test("pseudo - child", function() {
 
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Nth Child", "p:nth-child(1)", ["firstp","sndp"] );
+	t( "Nth Child With Whitespace", "p:nth-child( 1 )", ["firstp","sndp"] );
 	t( "Not Nth Child", "p:not(:nth-child(1))", ["ap","en","sap","first"] );
 
 	// Verify that the child position isn't being cached improperly
@@ -322,15 +359,19 @@ test("pseudo - child", function() {
 	t( "Nth-child", "#main form#form > *:nth-child(2)", ["text1"] );
 	t( "Nth-child", "#main form#form > :nth-child(2)", ["text1"] );
 
+	t( "Nth-child", "#form select:first option:nth-child(-1)", [] );
 	t( "Nth-child", "#form select:first option:nth-child(3)", ["option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(0n+3)", ["option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(1n+0)", ["option1a", "option1b", "option1c", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(1n)", ["option1a", "option1b", "option1c", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(n)", ["option1a", "option1b", "option1c", "option1d"] );
+	t( "Nth-child", "#form select:first option:nth-child(+n)", ["option1a", "option1b", "option1c", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(even)", ["option1b", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(odd)", ["option1a", "option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(2n)", ["option1b", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(2n+1)", ["option1a", "option1c"] );
+	t( "Nth-child", "#form select:first option:nth-child(2n + 1)", ["option1a", "option1c"] );
+	t( "Nth-child", "#form select:first option:nth-child(+2n + 1)", ["option1a", "option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(3n)", ["option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(3n+1)", ["option1a", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(3n+2)", ["option1b"] );
@@ -339,7 +380,9 @@ test("pseudo - child", function() {
 	t( "Nth-child", "#form select:first option:nth-child(3n-2)", ["option1a", "option1d"] );
 	t( "Nth-child", "#form select:first option:nth-child(3n-3)", ["option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(3n+0)", ["option1c"] );
+	t( "Nth-child", "#form select:first option:nth-child(-1n+3)", ["option1a", "option1b", "option1c"] );
 	t( "Nth-child", "#form select:first option:nth-child(-n+3)", ["option1a", "option1b", "option1c"] );
+	t( "Nth-child", "#form select:first option:nth-child(-1n + 3)", ["option1a", "option1b", "option1c"] );
 });
 
 test("pseudo - misc", function() {
-- 
cgit v1.2.3


From 3ab7b72919c8bd697e0cefab3b658bee0f51aef8 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Mon, 17 Jan 2011 18:07:52 -0500
Subject: Opera was falling back to undefined, which it didn't appreciate.

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

(limited to 'test')

diff --git a/test/unit/selector.js b/test/unit/selector.js
index f716cf4a9..27ad6e535 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,4 +1,4 @@
-module("selector", { teardown: moduleTeardown });
+module("selector");
 
 test("element", function() {
 	expect(21);
-- 
cgit v1.2.3


From e01e8d434d6e8421b93f328549b753191bb14c33 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Mon, 17 Jan 2011 18:08:51 -0500
Subject: Accidentally removed the module teardown code.

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

(limited to 'test')

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 27ad6e535..f716cf4a9 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,4 +1,4 @@
-module("selector");
+module("selector", { teardown: moduleTeardown });
 
 test("element", function() {
 	expect(21);
-- 
cgit v1.2.3


From 9c76ac4f6d295a5b593048e54b4c4231c092e58a Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Mon, 17 Jan 2011 18:12:42 -0500
Subject: Disabled a broken test for now, until WebKit browsers become more
 current.

---
 test/unit/selector.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/unit/selector.js b/test/unit/selector.js
index f716cf4a9..6a3832555 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -58,7 +58,7 @@ if ( location.protocol != "file:" ) {
 }
 
 test("broken", function() {
-	expect(20);
+	expect(19);
 
 	function broken(name, selector) {
 		try {
@@ -80,7 +80,10 @@ test("broken", function() {
 	broken( "Doesn't exist", ":visble", [] );
 	broken( "Nth-child", ":nth-child", [] );
 	broken( "Nth-child", ":nth-child(-)", [] );
-	broken( "Nth-child", ":nth-child(asdf)", [] );
+	// Sigh. WebKit thinks this is a real selector in qSA
+	// They've already fixed this and it'll be coming into
+	// current browsers soon.
+	//broken( "Nth-child", ":nth-child(asdf)", [] );
 	broken( "Nth-child", ":nth-child(2n+-0)", [] );
 	broken( "Nth-child", ":nth-child(2+0)", [] );
 	broken( "Nth-child", ":nth-child(- 1n)", [] );
-- 
cgit v1.2.3


From 35aeac13369c66d21f67cd7524f1cf341e3550ce Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Mon, 17 Jan 2011 18:55:40 -0600
Subject: Update unit test for #7608 which was leaking timers.

---
 test/unit/css.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/unit/css.js b/test/unit/css.js
index 1b2598741..555f13575 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -323,22 +323,13 @@ test(":visible selector works properly on children with a hidden parent (bug #45
 
 test("internal ref to elem.runtimeStyle (bug #7608)", function () {
 	expect(1);
-
-	var result = true,
-	val = 10;
+	var result = true;
 	
-	jQuery('<div id="bug7608" style="width:200px;border:solid 1px red;">' +
-    '<div  id="test" style="width:0%; background:#000;">&nbsp;</div></div>').appendTo("#main");
-
 	try {
-		// the bug is located within src/css.js
-		jQuery("#bug7608 #test").animate( { width: val }, 1000);
-
+		jQuery("#foo").css( { width: "0%" } ).css("width");
 	} catch (e) {
 		result = false;
 	}
 
 	ok( result, "elem.runtimeStyle does not throw exception" );
-  
-	jQuery("#bug7608").remove();
 });
-- 
cgit v1.2.3


From 9c763ad39d42c54d24f659e7895a8f361a08d27c Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Tue, 18 Jan 2011 15:13:09 -0500
Subject: Add another tweak for handling CSP - we need to make sure that we
 don't trigger any eval on load (not sure if it's the best tweak, definitely
 not ideal). Add a test page as well so that it's easier to catch problem.

---
 src/support.js | 11 ++++++++++-
 test/csp.php   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 test/csp.php

(limited to 'test')

diff --git a/src/support.js b/src/support.js
index f502811ae..7be28fdaf 100644
--- a/src/support.js
+++ b/src/support.js
@@ -75,7 +75,7 @@
 	jQuery.support.optDisabled = !opt.disabled;
 
 	jQuery.support.scriptEval = function() {
-		if ( jQuery.support._scriptEval === null) {
+		if ( jQuery.support._scriptEval === null ) {
 			var root = document.documentElement,
 				script = document.createElement("script"),
 				id = "script" + jQuery.now();
@@ -101,6 +101,7 @@
 			// release memory in IE
 			root = script = id  = null;
 		}
+
 		return jQuery.support._scriptEval;
 	};
 
@@ -187,6 +188,14 @@
 		var el = document.createElement("div");
 		eventName = "on" + eventName;
 
+		// We only care about the case where non-standard event systems
+		// are used, namely in IE. Short-circuiting here helps us to
+		// avoid an eval call (in setAttribute) which can cause CSP
+		// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+		if ( !el.attachEvent ) {
+			return true;
+		}
+
 		var isSupported = (eventName in el);
 		if ( !isSupported ) {
 			el.setAttribute(eventName, "return;");
diff --git a/test/csp.php b/test/csp.php
new file mode 100644
index 000000000..acf8f32c9
--- /dev/null
+++ b/test/csp.php
@@ -0,0 +1,30 @@
+<?php header("X-Content-Security-Policy-Report-Only: allow *"); ?>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>CSP Test Page</title>
+
+  <script src="../src/core.js"></script>
+  <script src="../src/support.js"></script>
+  <script src="../src/data.js"></script>
+  <script src="../src/queue.js"></script>
+  <script src="../src/attributes.js"></script>
+  <script src="../src/event.js"></script>
+  <script src="../src/sizzle/sizzle.js"></script>
+  <script src="../src/sizzle-jquery.js"></script>
+  <script src="../src/traversing.js"></script>
+  <script src="../src/manipulation.js"></script>
+  <script src="../src/css.js"></script>
+  <script src="../src/ajax.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>
+</head>
+<body>
+	<p>CSP Test Page</p>
+</body>
+</html>
-- 
cgit v1.2.3


From 96b00a493522fd3995f0752803da2c13bbf21755 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 19 Jan 2011 18:44:21 +0100
Subject: Moves active counter test after all other ajax tests where it should
 be.

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

(limited to 'test')

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 3f672ae04..52b059755 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1857,10 +1857,6 @@ test("jQuery ajax - atom+xml", function() {
 
 });
 
-test("jQuery.ajax - active counter", function() {
-    ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
-});
-
 test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
 	var success = false;
 	try {
@@ -1942,6 +1938,10 @@ test( "jQuery.ajax - statusCode" , function() {
 
 });
 
+test("jQuery.ajax - active counter", function() {
+    ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
+});
+
 }
 
 //}
\ No newline at end of file
-- 
cgit v1.2.3


From 948c0dfffcf077ed71e4712b38a33d06ea63264c Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Wed, 19 Jan 2011 21:02:46 -0500
Subject: Rework unit tests to check actual result elements.

---
 test/unit/traversing.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index b1fd8a9bf..e4b3e9537 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -441,12 +441,12 @@ test("add(String|Element|Array|undefined)", function() {
 test("add(String, Context)", function() {
 	expect(6);
 	
-	equals( jQuery("#firstp").add("#ap").length, 2, "Add selector to selector" );
-	equals( jQuery(document.getElementById("firstp")).add("#ap").length, 2, "Add gEBId to selector" );
-	equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap")).length, 2, "Add gEBId to gEBId" );
+	deepEqual( jQuery( "#firstp" ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add selector to selector " );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add gEBId to selector" );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( document.getElementById("ap") ).get(), q( "firstp", "ap" ), "Add gEBId to gEBId" );
 
 	var ctx = document.getElementById("firstp");
-	equals( jQuery("#firstp").add("#ap", ctx).length, 1, "Add selector to selector with context" );
-	equals( jQuery(document.getElementById("firstp")).add("#ap", ctx).length, 1, "Add gEBId to selector with context" );
-	equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap"), ctx).length, 2, "Add gEBId to gEBId with context" );
+	deepEqual( jQuery( "#firstp" ).add( "#ap", ctx ).get(), q( "firstp" ), "Add selector to selector " );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", ctx ).get(), q( "firstp" ), "Add gEBId to selector, not in context" );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", document.getElementsByTagName("body")[0] ).get(), q( "firstp", "ap" ), "Add gEBId to selector, in context" );
 });
-- 
cgit v1.2.3


From 64e1cdbb95b8bbefbc9dec70ae30e0714a549619 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 20 Jan 2011 04:12:15 +0100
Subject: Cleans up and simplifies code shared by ajaxPrefilter and
 ajaxTransport. Removes chainability of ajaxSetup, ajaxPrefilter and
 ajaxTransport. Also makes sure context is handled properly by ajaxSetup (unit
 test added).

---
 src/ajax.js        | 201 ++++++++++++++++++++++++-----------------------------
 src/ajax/jsonp.js  |   3 +-
 src/ajax/script.js |   6 +-
 test/unit/ajax.js  |  41 +++++++++++
 4 files changed, 138 insertions(+), 113 deletions(-)

(limited to 'test')

diff --git a/src/ajax.js b/src/ajax.js
index cbe557270..fc1ecfde3 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -161,7 +161,9 @@ jQuery.extend({
 
 	ajaxSetup: function( settings ) {
 		jQuery.extend( true, jQuery.ajaxSettings, settings );
-		return this;
+		if ( settings.context ) {
+			jQuery.ajaxSettings.context = settings.context;
+		}
 	},
 
 	ajaxSettings: {
@@ -278,6 +280,14 @@ jQuery.extend({
 
 	},
 
+	ajaxPrefilter: function( a , b ) {
+		ajaxPrefilterOrTransport( "prefilters" , a , b );
+	},
+
+	ajaxTransport: function( a , b ) {
+		return ajaxPrefilterOrTransport( "transports" , a , b );
+	},
+
 	// Main method
 	ajax: function( url , options ) {
 
@@ -299,7 +309,11 @@ jQuery.extend({
 			jQuery_lastModified = jQuery.lastModified,
 			jQuery_etag = jQuery.etag,
 			// Callbacks contexts
-			callbackContext = options.context || s.context || s,
+			// We force the original context if it exists
+			// or take it from jQuery.ajaxSettings otherwise
+			// (plain objects used as context get extended)
+			callbackContext =
+				( s.context = ( "context" in options ? options : jQuery.ajaxSettings ).context ) || s,
 			globalEventContext = callbackContext === s ? jQuery.event : jQuery( callbackContext ),
 			// Deferreds
 			deferred = jQuery.Deferred(),
@@ -373,10 +387,6 @@ jQuery.extend({
 				}
 			};
 
-		// We force the original context
-		// (plain objects used as context get extended)
-		s.context = options.context;
-
 		// 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)
@@ -850,126 +860,97 @@ jQuery.extend({
 
 });
 
-//Execute or select from functions in a given structure of options
-function ajax_selectOrExecute( structure , s , options ) {
+// Base function for both ajaxPrefilter and ajaxTransport
+function ajaxPrefilterOrTransport( arg0 , arg1 , arg2 ) {
 
-	var dataTypes = s.dataTypes,
-		transportDataType,
-		list,
-		selected,
+	var type = jQuery.type( arg1 ),
+		structure = jQuery.ajaxSettings[ arg0 ],
 		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 , options );
-
-			// 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 : 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 ] );
+		length;
+
+	// We have an options map so we have to inspect the structure
+	if ( type === "object" ) {
+
+		var options = arg1,
+			originalOptions = arg2,
+			// When dealing with prefilters, we execute only
+			// (no selection so we never stop when a function
+			// returns a non-falsy, non-string value)
+			executeOnly = ( arg0 === "prefilters" ),
+			inspect = function( dataType, tested ) {
+
+				if ( ! tested[ dataType ] ) {
+
+					tested[ dataType ] = true;
+
+					var list = structure[ dataType ],
+						selected;
+
+					for( i = 0, length = list ? list.length : 0 ; ( executeOnly || ! selected ) && i < length ; i++ ) {
+						selected = list[ i ]( options , originalOptions );
+						// If we got redirected to a different dataType,
+						// we add it and switch to the corresponding list
+						if ( typeof( selected ) === "string" && selected !== dataType ) {
+							options.dataTypes.unshift( selected );
+							selected = inspect( selected , tested );
+							// We always break in order not to continue
+							// to iterate in previous list
+							break;
+						}
+					}
+					// If we're only executing or nothing was selected
+					// we try the catchall dataType
+					if ( executeOnly || ! selected ) {
+						selected = inspect( "*" , tested );
+					}
+					// This will be ignored by ajaxPrefilter
+					// so it's safe to return no matter what
+					return selected;
+				}
 
-		if ( first === "object" ) {
-			return ajax_selectOrExecute( structure , args[ 0 ] , args[ 1 ] );
-		}
+			};
 
-		structure = jQuery.ajaxSettings[ structure ];
+		// Start inspection with current transport dataType
+		return inspect( options.dataTypes[ 0 ] , {} );
 
-		if ( first !== "function" ) {
+	} else {
 
-			dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-			dLength = dataTypes.length;
-			start = 1;
+		// We're requested to add to the structure
+		// Signature is ( dataTypeExpression , function )
+		// with dataTypeExpression being optional and
+		// defaulting to catchAll (*)
+		type = type === "function";
 
+		if ( type ) {
+			arg2 = arg1;
+			arg1 = undefined;
 		}
+		arg1 = arg1 || "*";
 
-		if ( dLength && start < length ) {
+		// We control that the second argument is really a function
+		if ( type || jQuery.isFunction( arg2 ) ) {
 
-			functors = sliceFunc.call( args , start );
-
-			for( i = 0 ; i < dLength ; i++ ) {
+			var dataTypes = arg1.split( /\s+/ ),
+				functor = arg2,
+				dataType,
+				list,
+				placeBefore;
 
+			// For each dataType in the dataTypeExpression
+			for( i = 0 , length = dataTypes.length ; i < length ; 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 );
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 );
 				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( functor );
 			}
 		}
 	}
-
-	return jQuery;
 }
 
-// Install prefilter & transport methods
-jQuery.each( [ "Prefilter" , "Transport" ] , function( _ , name ) {
-	_ = name.toLowerCase() + "s";
-	jQuery[ "ajax" + name ] = function() {
-		return ajax_addElement( _ , arguments );
-	};
-} );
-
 })( jQuery );
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 883876fc0..ff8d1f145 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -9,10 +9,11 @@ jQuery.ajaxSetup({
 	jsonpCallback: function() {
 		return "jsonp" + jsc++;
 	}
+});
 
 // Detect, normalize options and install callbacks for jsonp requests
 // (dataIsString is used internally)
-}).ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
+jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
 
 	dataIsString = ( typeof(s.data) === "string" );
 
diff --git a/src/ajax/script.js b/src/ajax/script.js
index b0e576f27..bdf69dd8b 100644
--- a/src/ajax/script.js
+++ b/src/ajax/script.js
@@ -14,9 +14,10 @@ jQuery.ajaxSetup({
 	converters: {
 		"text script": jQuery.globalEval
 	}
+});
 
 // Handle cache's special case and global
-}).ajaxPrefilter("script", function(s) {
+jQuery.ajaxPrefilter("script", function(s) {
 
 	if ( s.cache === undefined ) {
 		s.cache = false;
@@ -26,9 +27,10 @@ jQuery.ajaxSetup({
 		s.type = "GET";
 		s.global = false;
 	}
+});
 
 // Bind script tag hack transport
-}).ajaxTransport("script", function(s) {
+jQuery.ajaxTransport("script", function(s) {
 
 	// This transport only deals with cross domain requests
 	if ( s.crossDomain ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 52b059755..d262988eb 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -599,6 +599,47 @@ test("jQuery.ajax context modification", function() {
 	equals( obj.test, "foo", "Make sure the original object is maintained." );
 });
 
+test("jQuery.ajax context modification through ajaxSetup", function() {
+	expect(4);
+
+	stop();
+
+	var obj = {};
+
+	jQuery.ajaxSetup({
+		context: obj
+	});
+
+	strictEqual( jQuery.ajaxSettings.context, obj, "Make sure the context is properly set in ajaxSettings." );
+
+	jQuery.ajax({
+		url: url("data/name.html"),
+		complete: function() {
+			strictEqual( this, obj, "Make sure the original object is maintained." );
+			jQuery.ajax({
+				url: url("data/name.html"),
+				context: {},
+				complete: function() {
+					ok( this !== obj, "Make sure overidding context is possible." );
+					jQuery.ajaxSetup({
+						context: false
+					});
+					jQuery.ajax({
+						url: url("data/name.html"),
+						beforeSend: function(){
+							this.test = "foo2";
+						},
+						complete: function() {
+							ok( this !== obj, "Make sure unsetting context is possible." );
+							start();
+						}
+					});
+				}
+			});
+		}
+	});
+});
+
 test("jQuery.ajax() - disabled globals", function() {
 	expect( 3 );
 	stop();
-- 
cgit v1.2.3


From 9ab00a712fe3757f130dce8b42293c82a68c690e Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 20 Jan 2011 15:39:30 +0100
Subject: Makes sure statusCode callbacks are ordered in the same way success
 and error callbacks are. Unit tests added.

---
 src/ajax.js       |  8 ++++----
 test/unit/ajax.js | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/src/ajax.js b/src/ajax.js
index fc1ecfde3..63914d23a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -427,10 +427,8 @@ jQuery.extend({
 				// Stored error
 				error,
 
-				// Keep track of statusCode callbacks
-				oldStatusCode = statusCode;
-
-			statusCode = undefined;
+				// To keep track of statusCode based callbacks
+				oldStatusCode;
 
 			// If successful, handle type chaining
 			if ( status >= 200 && status < 300 || status === 304 ) {
@@ -588,6 +586,8 @@ jQuery.extend({
 			}
 
 			// Status-dependent callbacks
+			oldStatusCode = statusCode;
+			statusCode = undefined;
 			jXHR.statusCode( oldStatusCode );
 
 			if ( s.global ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index d262988eb..1ed15b50c 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1911,9 +1911,9 @@ test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
 
 test( "jQuery.ajax - statusCode" , function() {
 
-	var count = 10;
+	var count = 12;
 
-	expect( 16 );
+	expect( 20 );
 	stop();
 
 	function countComplete() {
@@ -1975,8 +1975,35 @@ test( "jQuery.ajax - statusCode" , function() {
 			}
 		}).statusCode( createStatusCodes( "all (immediately with method)" , isSuccess ) );
 
-	});
+		var testString = "";
+
+		jQuery.ajax( url( uri ), {
+			success: function( a , b , jXHR ) {
+				ok( isSuccess , "success" );
+				var statusCode = {};
+				statusCode[ jXHR.status ] = function() {
+					testString += "B";
+				};
+				jXHR.statusCode( statusCode );
+				testString += "A";
+			},
+			error: function( jXHR ) {
+				ok( ! isSuccess , "error" );
+				var statusCode = {};
+				statusCode[ jXHR.status ] = function() {
+					testString += "B";
+				};
+				jXHR.statusCode( statusCode );
+				testString += "A";
+			},
+			complete: function() {
+				strictEqual( testString , "AB" , "Test statusCode callbacks are ordered like " +
+						( isSuccess ? "success" :  "error" ) + " callbacks" );
+				countComplete();
+			}
+		} );
 
+	});
 });
 
 test("jQuery.ajax - active counter", function() {
-- 
cgit v1.2.3


From a7cb93bee529a09056f521e6c0b760447b5cfb29 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 20 Jan 2011 17:51:57 +0100
Subject: Renames Deferred's fire and fireReject methods as resolveWith and
 rejectWith respectively.

---
 src/ajax.js       |  6 +++---
 src/core.js       | 14 +++++++-------
 test/unit/core.js |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/src/ajax.js b/src/ajax.js
index 955856cc2..a92522f5b 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -577,9 +577,9 @@ jQuery.extend({
 
 			// Success/Error
 			if ( isSuccess ) {
-				deferred.fire( callbackContext , [ success , statusText , jXHR ] );
+				deferred.resolveWith( callbackContext , [ success , statusText , jXHR ] );
 			} else {
-				deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
+				deferred.rejectWith( callbackContext , [ jXHR , statusText , error ] );
 			}
 
 			// Status-dependent callbacks
@@ -593,7 +593,7 @@ jQuery.extend({
 			}
 
 			// Complete
-			completeDeferred.fire( callbackContext, [ jXHR , statusText ] );
+			completeDeferred.resolveWith( callbackContext, [ jXHR , statusText ] );
 
 			if ( s.global ) {
 				globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] );
diff --git a/src/core.js b/src/core.js
index f116ef4d1..69f4f5ac9 100644
--- a/src/core.js
+++ b/src/core.js
@@ -406,7 +406,7 @@ jQuery.extend({
 			}
 
 			// If there are functions bound, to execute
-			readyList.fire( document , [ jQuery ] );
+			readyList.resolveWith( document , [ jQuery ] );
 
 			// Trigger any bound ready events
 			if ( jQuery.fn.trigger ) {
@@ -844,7 +844,7 @@ jQuery.extend({
 						}
 
 						if ( _fired ) {
-							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
+							deferred.resolveWith( _fired[ 0 ] , _fired[ 1 ] );
 						}
 					}
 
@@ -852,7 +852,7 @@ jQuery.extend({
 				},
 
 				// resolve with given context and args
-				fire: function( context , args ) {
+				resolveWith: function( context , args ) {
 					if ( ! cancelled && ! fired && ! firing ) {
 
 						firing = 1;
@@ -872,7 +872,7 @@ jQuery.extend({
 
 				// resolve with this as context and given arguments
 				resolve: function() {
-					deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
+					deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
 					return this;
 				},
 
@@ -908,7 +908,7 @@ jQuery.extend({
 				return this;
 			},
 			fail: failDeferred.done,
-			fireReject: failDeferred.fire,
+			rejectWith: failDeferred.resolveWith,
 			reject: failDeferred.resolve,
 			isRejected: failDeferred.isResolved,
 			// Get a promise for this deferred
@@ -961,10 +961,10 @@ jQuery.extend({
 					args = arguments;
 					resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
 					if( ! --length ) {
-						deferred.fire( promise, resolveArray );
+						deferred.resolveWith( promise, resolveArray );
 					}
 				}).fail( function() {
-					deferred.fireReject( promise, arguments );
+					deferred.rejectWith( promise, arguments );
 				});
 				return !deferred.isRejected();
 			});
diff --git a/test/unit/core.js b/test/unit/core.js
index 8e57edf95..30039bf92 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1002,7 +1002,7 @@ test("jQuery._Deferred()", function() {
 
 	deferred = jQuery._Deferred();
 
-	deferred.fire( jQuery , [ document ] ).done( function( doc ) {
+	deferred.resolveWith( jQuery , [ document ] ).done( function( doc ) {
 		ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
 	});
 });
-- 
cgit v1.2.3


From dc2e7317a90464e729fd9f29afaa16fa9c01487c Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Fri, 21 Jan 2011 03:58:28 +0100
Subject: Replaces "text in-between" technique with a full-fledged one-level
 transitive search for converters (unit tests added). Also cleans up auto
 dataType determination and adds converter checks in order to guess the best
 dataType possible.

---
 src/ajax.js       | 105 +++++++++++++++++++++++++++++++++---------------------
 test/unit/ajax.js |  43 ++++++++++++++++++++++
 2 files changed, 108 insertions(+), 40 deletions(-)

(limited to 'test')

diff --git a/src/ajax.js b/src/ajax.js
index bf0259cfd..187236576 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -372,8 +372,9 @@ jQuery.extend({
 				clearTimeout(timeoutTimer);
 			}
 
-			var // Reference dataTypes and responseFields
+			var // Reference dataTypes, converters and responseFields
 				dataTypes = s.dataTypes,
+				converters = s.converters,
 				responseFields = s.responseFields,
 				responseField,
 
@@ -400,44 +401,64 @@ jQuery.extend({
 					transportDataType = dataTypes[0],
 					ct,
 					type,
-					finalDataType;
+					finalDataType,
+					firstDataType;
 
 				// Auto (xml, json, script or text determined given headers)
-				if ( transportDataType === "*" && ( ct = jXHR.getResponseHeader( "content-type" ) ) ) {
+				if ( transportDataType === "*" ) {
 
+					// Remove all auto types
+					while( dataTypes[0] === "*" ) {
+						dataTypes.shift();
+					}
+					transportDataTypes = dataTypes[0];
+
+					// Get content type
+					ct = jXHR.getResponseHeader( "content-type" );
+
+					// Check if it's a known type
 					for ( type in contents ) {
 						if ( contents[ type ] && contents[ type ].test( ct ) ) {
-							transportDataType = dataTypes[0] = type;
+							dataTypes.unshift( ( transportDataType = type ) );
 							break;
 						}
 					}
-
-					type = undefined;
 				}
 
-				// Get final dataType
-				for( type in responses ) {
-					if ( ! finalDataType && type === transportDataType ) {
-						finalDataType = type;
-					}
-					responseField = responseFields[ type ];
-					if ( responseField && ! ( responseField in jXHR ) ) {
-						jXHR[ responseField ] = responses[ type ];
+				// Check to see if we have a response for the expected dataType
+				if ( transportDataType in responses ) {
+					finalDataType = transportDataType;
+				} else {
+					// Try convertible dataTypes
+					for ( type in responses ) {
+						if ( ! firstDataType ) {
+							firstDataType = type;
+						}
+						if ( ! transportDataType || converters[ type + " " + transportDataType ] ) {
+							finalDataType = type;
+							break;
+						}
 					}
+					// Or just use first one
+					finalDataType = finalDataType || firstDataType;
 				}
 
-				// If no response with the expected dataType was provided
-				// Take the last response as a default if it exists
-				if ( ! finalDataType && type ) {
-					finalDataType = type;
-					if ( transportDataType === "*" ) {
-						dataTypes.shift();
+				// If we found a dataType
+				// We get the corresponding response
+				// and add the dataType to the list if needed
+				if ( finalDataType ) {
+					response = responses[ finalDataType ];
+					if ( finalDataType !== transportDataType ) {
+						dataTypes.unshift( finalDataType );
 					}
-					dataTypes.unshift( finalDataType );
 				}
 
-				// Get final response
-				response = responses[ finalDataType ];
+				// Fill responseXXX fields
+				for( type in responseFields ) {
+					if ( type in responses ) {
+						jXHR[ responseFields[ type ] ] = responses[ type ];
+					}
+				}
 			}
 
 			// If successful, handle type chaining
@@ -473,6 +494,7 @@ jQuery.extend({
 					try {
 
 						var i,
+							tmp,
 							// Current dataType
 							current,
 							// Previous dataType
@@ -483,9 +505,7 @@ jQuery.extend({
 							conv,
 							// Conversion functions (when text is used in-between)
 							conv1,
-							conv2,
-							// Local references to converters
-							converters = s.converters;
+							conv2;
 
 						// For each dataType in the chain
 						for( i = 0 ; i < dataTypes.length ; i++ ) {
@@ -505,26 +525,31 @@ jQuery.extend({
 								// Get the dataType to convert from
 								prev = dataTypes[ i - 1 ];
 
-								// If no catch-all and dataTypes are actually different
+								// If no auto and dataTypes are actually different
 								if ( prev !== "*" && current !== "*" && prev !== current ) {
 
 									// Get the converter
 									conversion = prev + " " + current;
 									conv = converters[ conversion ] || 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 there is no direct converter, search transitively
+									if ( ! conv ) {
+										conv1 = conv2 = undefined;
+
+										for( conv1 in converters ) {
+											tmp = conv1.split( " " );
+											if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+												conv2 = converters[ tmp[ 1 ] + " " + current ];
+												if ( conv2 ) {
+													conv1 = converters[ conv1 ];
+													if ( conv1 === true ) {
+														conv = conv2;
+													} else if ( conv2 === true ) {
+														conv = conv1;
+													}
+													break;
+												}
+											}
 										}
 									}
 									// If we found no converter, dispatch an error
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 1ed15b50c..b44f0773f 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -2006,6 +2006,49 @@ test( "jQuery.ajax - statusCode" , function() {
 	});
 });
 
+test("jQuery.ajax - transitive conversions", function() {
+
+	expect( 8 );
+
+	stop();
+
+	jQuery.when(
+
+		jQuery.ajax( url("data/json.php") , {
+			converters: {
+				"json myjson": function( data ) {
+					ok( true , "converter called" );
+					return data;
+				}
+			},
+			dataType: "myjson",
+			success: function() {
+				ok( true , "Transitive conversion worked" );
+				strictEqual( this.dataTypes[0] , "text" , "response was retrieved as text" );
+				strictEqual( this.dataTypes[1] , "myjson" , "request expected myjson dataType" );
+			}
+		}),
+
+		jQuery.ajax( url("data/json.php") , {
+			converters: {
+				"json myjson": function( data ) {
+					ok( true , "converter called (*)" );
+					return data;
+				}
+			},
+			contents: false, /* headers are wrong so we ignore them */
+			dataType: "* myjson",
+			success: function() {
+				ok( true , "Transitive conversion worked (*)" );
+				strictEqual( this.dataTypes[0] , "text" , "response was retrieved as text (*)" );
+				strictEqual( this.dataTypes[1] , "myjson" , "request expected myjson dataType (*)" );
+			}
+		})
+
+	).then( start , start );
+
+});
+
 test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });
-- 
cgit v1.2.3


From 328a86f9a0d3f0907cc950f7543e34cb3efbda3f Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Fri, 21 Jan 2011 09:24:09 -0500
Subject: Revert "Make sure that focusin/focusout bubbles in non-IE browsers."
 This was causing problems with the focusin event, see: #7340.

This reverts commit 88068f82c199847d3679b130664dd91cc2e89f00.

Conflicts:

	src/event.js
	test/unit/event.js
---
 src/event.js       | 15 +++++----------
 test/unit/event.js | 20 --------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'test')

diff --git a/src/event.js b/src/event.js
index 2ddf28812..2d53562ad 100644
--- a/src/event.js
+++ b/src/event.js
@@ -8,7 +8,6 @@ var rnamespaces = /\.(.*)$/,
 	fcleanup = function( nm ) {
 		return nm.replace(rescape, "\\$&");
 	},
-	focusCounts = { focusin: 0, focusout: 0 },
 	eventKey = "events";
 
 /*
@@ -880,21 +879,17 @@ if ( document.addEventListener ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				if ( focusCounts[fix]++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --focusCounts[fix] === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
+				this.addEventListener( orig, handler, true );
+			}, 
+			teardown: function() { 
+				this.removeEventListener( orig, handler, true );
 			}
 		};
 
 		function handler( e ) {
 			e = jQuery.event.fix( e );
 			e.type = fix;
-			return jQuery.event.trigger( e, null, e.target );
+			return jQuery.event.handle.call( this, e );
 		}
 	});
 }
diff --git a/test/unit/event.js b/test/unit/event.js
index 02824a9a3..e4caee82a 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1953,26 +1953,6 @@ test("window resize", function() {
 	ok( !jQuery._data(window, "__events__"), "Make sure all the events are gone." );
 });
 
-test("focusin bubbles", function() {
-	//create an input and focusin on it
-	var input = jQuery("<input/>"), order = 0;
-
-	input.prependTo("body");
-
-	jQuery("body").bind("focusin.focusinBubblesTest",function(){
-		equals(1,order++,"focusin on the body second")
-	});
-
-	input.bind("focusin.focusinBubblesTest",function(){
-		equals(0,order++,"focusin on the element first")
-	});
-
-	input[0].focus();
-	input.remove();
-
-	jQuery("body").unbind("focusin.focusinBubblesTest");
-});
-
 /*
 test("jQuery(function($) {})", function() {
 	stop();
-- 
cgit v1.2.3