From c5264ce196c2f6d60b9d662a160f8e146c9aa23c Mon Sep 17 00:00:00 2001
From: louisremi <louisremi@louisremi-laptop.(none)>
Date: Wed, 23 Feb 2011 15:53:29 +0100
Subject: [PATCH 01/80] fix the regular expression that turns camel-case
 properties to lower-case ones for IE9. Fixes #8346

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

diff --git a/src/css.js b/src/css.js
index 8a982312f..86a5c71a1 100644
--- a/src/css.js
+++ b/src/css.js
@@ -3,7 +3,7 @@
 var ralpha = /alpha\([^)]*\)/i,
 	ropacity = /opacity=([^)]*)/,
 	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
+	rupper = /([A-Z]|^ms)/g,
 	rnumpx = /^-?\d+(?:px)?$/i,
 	rnum = /^-?\d/,
 

From e27fcf42ce152ede15c8617bb5d31dfb2088470c Mon Sep 17 00:00:00 2001
From: louisremi <louisremi@louisremi-laptop.(none)>
Date: Wed, 23 Feb 2011 15:55:13 +0100
Subject: [PATCH 02/80] comments for workarounds are always welcome.

---
 src/css.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/css.js b/src/css.js
index 86a5c71a1..04e205eb4 100644
--- a/src/css.js
+++ b/src/css.js
@@ -3,6 +3,7 @@
 var ralpha = /alpha\([^)]*\)/i,
 	ropacity = /opacity=([^)]*)/,
 	rdashAlpha = /-([a-z])/ig,
+	// fixed for IE9, see #8346
 	rupper = /([A-Z]|^ms)/g,
 	rnumpx = /^-?\d+(?:px)?$/i,
 	rnum = /^-?\d/,

From 55ec6a71d2378a5301af71c2c0080e15289c3f78 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Fri, 4 Mar 2011 21:16:40 -0500
Subject: [PATCH 03/80] Fixes #7340. Use a single capturing handler to simulate
 bubbling focusin/focusout event on non-IE browsers. Allow native DOM methods
 to fire events other than the currently active one back into jQuery.

---
 src/event.js       | 32 +++++++++++++++++++++++---------
 test/unit/event.js | 25 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/event.js b/src/event.js
index f7e0a08c0..61c8a93fd 100644
--- a/src/event.js
+++ b/src/event.js
@@ -70,10 +70,10 @@ jQuery.event = {
 		}
 
 		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
+			elemData.handle = eventHandle = function( e ) {
 				// Handle the second event of a trigger and when
 				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
 					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
 					undefined;
 			};
@@ -380,7 +380,7 @@ jQuery.event = {
 							target[ "on" + targetType ] = null;
 						}
 
-						jQuery.event.triggered = true;
+						jQuery.event.triggered = event.type;
 						target[ targetType ]();
 					}
 
@@ -391,7 +391,7 @@ jQuery.event = {
 					target[ "on" + targetType ] = old;
 				}
 
-				jQuery.event.triggered = false;
+				jQuery.event.triggered = undefined;
 			}
 		}
 	},
@@ -868,19 +868,33 @@ function trigger( type, elem, args ) {
 // Create "bubbling" focus and blur events
 if ( document.addEventListener ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+	
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0;
+		
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				this.addEventListener( orig, handler, true );
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
 			},
 			teardown: function() {
-				this.removeEventListener( orig, handler, true );
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
 			}
 		};
 
-		function handler( e ) {
-			e = jQuery.event.fix( e );
+		function handler( donor ) {
+			// Donor event is always a native one; fix it and switch its type.
+			// Let focusin/out handler cancel the donor focus/blur event.
+			var e = jQuery.event.fix( donor );
 			e.type = fix;
-			return jQuery.event.handle.call( this, e );
+			e.originalEvent = {};
+			jQuery.event.trigger( e, null, e.target );
+			if ( e.isDefaultPrevented() ) {
+				donor.preventDefault();
+			}
 		}
 	});
 }
diff --git a/test/unit/event.js b/test/unit/event.js
index b7b260462..d54987923 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1966,6 +1966,31 @@ test("window resize", function() {
 	ok( !jQuery._data(window, "__events__"), "Make sure all the events are gone." );
 });
 
+test("focusin bubbles", function() {
+	expect(4);
+	
+	var input = jQuery( '<input type="text" />' ).prependTo( "body" ), 
+		order = 0;
+
+	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" );
+	});
+
+	// DOM focus method
+	input[0].focus();
+	// jQuery trigger, which calls DOM focus
+	order = 0;
+	input[0].blur();
+	input.trigger( "focus" );
+
+	input.remove();
+	jQuery( "body" ).unbind( "focusin.focusinBubblesTest" );
+});
+
 /*
 test("jQuery(function($) {})", function() {
 	stop();

From 5c2d70979c15bbda5c90e1634abe11d8c350abcb Mon Sep 17 00:00:00 2001
From: Jordan Boesch <jboesch26@gmail.com>
Date: Sat, 5 Mar 2011 09:30:29 -0600
Subject: [PATCH 04/80] bug 6158; fixing replaceWith from throwing errors on
 empty elements

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

diff --git a/src/manipulation.js b/src/manipulation.js
index ba3169715..a4a81de44 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -261,6 +261,9 @@ jQuery.fn.extend({
 				}
 			});
 		} else {
+            if ( !this.length ) {
+                return this;
+            }
 			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
 		}
 	},

From c9ef09c800ba7b6510d9e3a68f053ae29409f621 Mon Sep 17 00:00:00 2001
From: Jordan Boesch <jboesch26@gmail.com>
Date: Sat, 5 Mar 2011 09:46:12 -0600
Subject: [PATCH 05/80] bug 6158; fixing replaceWith from throwing errors on
 non existant elements

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

diff --git a/src/manipulation.js b/src/manipulation.js
index a4a81de44..613faabb9 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -261,10 +261,9 @@ jQuery.fn.extend({
 				}
 			});
 		} else {
-            if ( !this.length ) {
-                return this;
-            }
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+			return ( this.length ) ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
 		}
 	},
 
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 34425ed3a..1169032ce 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -739,7 +739,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(20);
+	expect(21);
 	jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
 	ok( jQuery("#replace")[0], 'Replace element with string' );
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -799,6 +799,9 @@ var testReplaceWith = function(val) {
 	var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
 	equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
 	equals( set.length, 1, "Replace the disconnected node." );
+	
+	var non_existant = jQuery('#does-not-exist').replaceWith( val("<b>should not throw an error</b>") );
+	equals( non_existant.length, 0, "Length of non existant element." )
 
 	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
 	// TODO: Work on jQuery(...) inline script execution
@@ -827,7 +830,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
 	testReplaceWith(functionReturningObj);
 
-	expect(21);
+	expect(22);
 
 	var y = jQuery("#yahoo")[0];
 

From dd100bf5ac56d5d44afe45d73fe1824bd0135872 Mon Sep 17 00:00:00 2001
From: Jordan Boesch <jboesch26@gmail.com>
Date: Sat, 5 Mar 2011 09:59:25 -0600
Subject: [PATCH 06/80] bug 6158; fixing replaceWith from throwing errors on
 non existant elements; fixing semicolon

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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 1169032ce..ff3dff164 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -799,9 +799,9 @@ var testReplaceWith = function(val) {
 	var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
 	equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
 	equals( set.length, 1, "Replace the disconnected node." );
-	
+
 	var non_existant = jQuery('#does-not-exist').replaceWith( val("<b>should not throw an error</b>") );
-	equals( non_existant.length, 0, "Length of non existant element." )
+	equals( non_existant.length, 0, "Length of non existant element." );
 
 	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
 	// TODO: Work on jQuery(...) inline script execution

From 2ac4067a639856a6035c3bd00aab132c9714b52d Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Wed, 9 Mar 2011 22:38:26 -0500
Subject: [PATCH 07/80] Fixes #8456. Make sure parent is not null before
 crawling into its lap, so mouseenter is triggered on a mouseover event.

---
 src/event.js       |  2 +-
 test/unit/event.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/event.js b/src/event.js
index f7e0a08c0..2620646da 100644
--- a/src/event.js
+++ b/src/event.js
@@ -661,7 +661,7 @@ var withinElement = function( event ) {
 
 		// Chrome does something similar, the parentNode property
 		// can be accessed but is null.
-		if ( parent !== document && !parent.parentNode ) {
+		if ( parent && parent !== document && !parent.parentNode ) {
 			return;
 		}
 		// Traverse up the tree
diff --git a/test/unit/event.js b/test/unit/event.js
index b7b260462..d66aaac9b 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -683,6 +683,20 @@ test("hover()", function() {
 	equals( times, 4, "hover handlers fired" );
 });
 
+test("mouseover triggers mouseenter", function() {
+	expect(1);
+	
+	var count = 0,
+		elem = jQuery("<a />");
+	elem.mouseenter(function () {
+	  count++;
+	});
+	elem.trigger('mouseover');
+	equals(count, 1, "make sure mouseover triggers a mouseenter" );
+	
+	elem.remove();
+});
+
 test("trigger() shortcuts", function() {
 	expect(6);
 

From 515c56f9c6394a4ddadf29c55867f71dec6dcdb7 Mon Sep 17 00:00:00 2001
From: JessThrysoee <jess@thrysoee.dk>
Date: Fri, 11 Mar 2011 00:17:38 +0100
Subject: [PATCH 08/80] Make it possible to force the Ajax crossDomain option
 to false.

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

diff --git a/src/ajax.js b/src/ajax.js
index 4714afdae..66b26cd70 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -310,6 +310,7 @@ jQuery.extend({
 		contentType: "application/x-www-form-urlencoded",
 		processData: true,
 		async: true,
+		crossDomain: null,
 		/*
 		timeout: 0,
 		data: null,
@@ -319,7 +320,6 @@ jQuery.extend({
 		cache: null,
 		traditional: false,
 		headers: {},
-		crossDomain: null,
 		*/
 
 		accepts: {
@@ -604,7 +604,7 @@ jQuery.extend({
 		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
 
 		// Determine if a cross-domain request is in order
-		if ( !s.crossDomain ) {
+		if ( s.crossDomain == null ) {
 			parts = rurl.exec( s.url.toLowerCase() );
 			s.crossDomain = !!( parts &&
 				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||

From 11c26b3cc9bf84f93d34f45056d29a446baeb6c9 Mon Sep 17 00:00:00 2001
From: JessThrysoee <jess@thrysoee.dk>
Date: Fri, 11 Mar 2011 17:46:59 +0100
Subject: [PATCH 09/80] no need to specifically initialize crossDomain to null

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

diff --git a/src/ajax.js b/src/ajax.js
index 66b26cd70..4290e295c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -310,7 +310,6 @@ jQuery.extend({
 		contentType: "application/x-www-form-urlencoded",
 		processData: true,
 		async: true,
-		crossDomain: null,
 		/*
 		timeout: 0,
 		data: null,
@@ -320,6 +319,7 @@ jQuery.extend({
 		cache: null,
 		traditional: false,
 		headers: {},
+		crossDomain: null,
 		*/
 
 		accepts: {

From 124acbfbc523614dc5835cfce2c82b867a59986f Mon Sep 17 00:00:00 2001
From: Jordan Boesch <jordan@boedesign.com>
Date: Mon, 14 Mar 2011 14:17:02 -0600
Subject: [PATCH 10/80] removing parens

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

diff --git a/src/manipulation.js b/src/manipulation.js
index 613faabb9..27f81cc24 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -261,7 +261,7 @@ jQuery.fn.extend({
 				}
 			});
 		} else {
-			return ( this.length ) ?
+			return this.length ?
 				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
 				this;
 		}

From 714ae379db9dcb704c04080196a05d13a028f7a4 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Tue, 15 Mar 2011 19:20:03 +0100
Subject: [PATCH 11/80] Fixes #8509. Makes URL regexp less overzealous and
 ensures it recognizes URL schemes which do not contain a conformant
 hierarchical structure ( as per section 2.1.2 of
 http://www.ietf.org/rfc/rfc2718.txt ). Also adds about: and adobe air's app:
 and app-storage: to the list of local protocols and provides a failover in
 case document.location is illformed. Unit test added.

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

diff --git a/src/ajax.js b/src/ajax.js
index 4714afdae..add3b3738 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -7,7 +7,7 @@ var r20 = /%20/g,
 	rheaders = /^(.*?):[ \t]*([^\r\n]*)\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,
 	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /(?:^file|^widget|\-extension):$/,
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rprotocol = /^\/\//,
 	rquery = /\?/,
@@ -19,7 +19,7 @@ var r20 = /%20/g,
 	rucHeadersFunc = function( _, $1, $2 ) {
 		return $1 + $2.toUpperCase();
 	},
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?|\/[^\/])/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
 
 	// Keep a copy of the old load method
 	_load = jQuery.fn.load,
@@ -61,7 +61,7 @@ try {
 }
 
 // Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() );
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 2a2ac46a1..7c572a32c 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -492,7 +492,7 @@ test(".ajax() - hash", function() {
 
 test("jQuery ajax - cross-domain detection", function() {
 
-	expect( 5 );
+	expect( 6 );
 
 	var loc = document.location,
 		otherPort = loc.port === 666 ? 667 : 666,
@@ -508,6 +508,7 @@ test("jQuery ajax - cross-domain detection", function() {
 	});
 
 	jQuery.ajax({
+		dataType: "jsonp",
 		url: 'app:/path',
 		beforeSend: function( _ , s ) {
 			ok( s.crossDomain , "Adobe AIR app:/ URL detected as cross-domain" );
@@ -533,6 +534,15 @@ test("jQuery ajax - cross-domain detection", function() {
 		}
 	});
 
+	jQuery.ajax({
+		dataType: "jsonp",
+		url: "about:blank",
+		beforeSend: function( _ , s ) {
+			ok( s.crossDomain , "Test about:blank is detected as cross-domain" );
+			return false;
+		}
+	});
+
 	jQuery.ajax({
 		dataType: "jsonp",
 		url: loc.protocol + "//" + loc.host,

From 150d3decb54971a7378fb48d0b6970d3fb50ff95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Tue, 15 Mar 2011 20:16:09 +0100
Subject: [PATCH 12/80] Introduce submodules, closes #8536

Instead of the manual clone of sizzle and qunit, use git submodules
instead. this will ensure that all future releases can be recreated by
checking out an tag.
---
 .gitignore  |  2 --
 .gitmodules |  6 ++++++
 Makefile    | 34 ++++------------------------------
 src/sizzle  |  1 +
 test/qunit  |  1 +
 5 files changed, 12 insertions(+), 32 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/sizzle
 create mode 160000 test/qunit

diff --git a/.gitignore b/.gitignore
index a77d67a96..6cd547974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,5 @@ dist
 *~
 *.diff
 *.patch
-test/qunit
-src/sizzle
 /*.html
 .DS_Store
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..80ce23688
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/sizzle"]
+	path = src/sizzle
+	url = git://github.com/jeresig/sizzle.git
+[submodule "test/qunit"]
+	path = test/qunit
+	url = git://github.com/jquery/qunit.git
diff --git a/Makefile b/Makefile
index a6aae4253..e0d1da716 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-V ?= 0
-
 SRC_DIR = src
 TEST_DIR = test
 BUILD_DIR = build
@@ -38,7 +36,6 @@ JQ = ${DIST_DIR}/jquery.js
 JQ_MIN = ${DIST_DIR}/jquery.min.js
 
 SIZZLE_DIR = ${SRC_DIR}/sizzle
-QUNIT_DIR = ${TEST_DIR}/qunit
 
 JQ_VER = $(shell cat version.txt)
 VER = sed "s/@VERSION/${JQ_VER}/"
@@ -51,32 +48,8 @@ all: jquery min lint
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-ifeq ($(strip $(V)),0)
-verbose = --quiet
-else ifeq ($(strip $(V)),1)
-verbose =
-else
-verbose = --verbose
-endif
-
-define clone_or_pull
--@@if test ! -d $(strip ${1})/.git; then \
-		echo "Cloning $(strip ${1})..."; \
-		git clone $(strip ${verbose}) --depth=1 $(strip ${2}) $(strip ${1}); \
-	else \
-		echo "Pulling $(strip ${1})..."; \
-		git --git-dir=$(strip ${1})/.git pull $(strip ${verbose}) origin master; \
-	fi
-
-endef
-
-${QUNIT_DIR}:
-	$(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git)
-
-${SIZZLE_DIR}:
-	$(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git)
-
-init: ${QUNIT_DIR} ${SIZZLE_DIR}
+init:
+	@@if [ -d .git ]; then git submodule update --init --recursive; fi
 
 jquery: init ${JQ}
 jq: init ${JQ}
@@ -122,7 +95,8 @@ clean:
 	@@echo "Removing built copy of Sizzle"
 	@@rm -f src/selector.js
 
-	@@echo "Removing cloned directories"
+distclean: clean
+	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
 .PHONY: all jquery lint min init jq clean
diff --git a/src/sizzle b/src/sizzle
new file mode 160000
index 000000000..ef19279f5
--- /dev/null
+++ b/src/sizzle
@@ -0,0 +1 @@
+Subproject commit ef19279f54ba49242c6461d47577c703f4f4e80e
diff --git a/test/qunit b/test/qunit
new file mode 160000
index 000000000..d404faf8f
--- /dev/null
+++ b/test/qunit
@@ -0,0 +1 @@
+Subproject commit d404faf8f587fcbe6b8907943022e6318dd51e0c

From cd2ca7b5918b3cedfed497ac7d86bfd2c5f92a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Tue, 15 Mar 2011 21:25:51 +0100
Subject: [PATCH 13/80] pull submodules make command

Adding an helper funciton to pull the latest from all registered
submodules
---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index e0d1da716..7b67f7aff 100644
--- a/Makefile
+++ b/Makefile
@@ -99,4 +99,9 @@ distclean: clean
 	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
+# update the submodules to the latest at the most logical branch
+pull_submodules:
+	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
+	@@git submodule summary
+
 .PHONY: all jquery lint min init jq clean

From bd4468886d97edfb53342e1a10acb300d081ed27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Tue, 15 Mar 2011 21:42:58 +0100
Subject: [PATCH 14/80] adding pull command

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 7b67f7aff..84816a19e 100644
--- a/Makefile
+++ b/Makefile
@@ -104,4 +104,7 @@ pull_submodules:
 	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
 	@@git submodule summary
 
+pull: pull_submodules
+	@@git pull ${REMOTE} ${BRANCH}
+
 .PHONY: all jquery lint min init jq clean

From 51abb3dc071fd86afd346ec5c340734f5c61064f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Fri, 4 Mar 2011 23:33:20 +0100
Subject: [PATCH 15/80] Changing dependice order for minify to prevent reminify

unless jquery.js has been updated, no minification should occur

closes: #8519
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 84816a19e..7b87c9f51 100644
--- a/Makefile
+++ b/Makefile
@@ -75,9 +75,9 @@ lint: jquery
 		echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
 	fi
 
-min: ${JQ_MIN}
+min: jquery ${JQ_MIN}
 
-${JQ_MIN}: jquery
+${JQ_MIN}: ${JQ}
 	@@if test ! -z ${JS_ENGINE}; then \
 		echo "Minifying jQuery" ${JQ_MIN}; \
 		${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \

From a2faed347de389d6f667a4e98576398db88d1a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 19:50:53 +0100
Subject: [PATCH 16/80] Merge when updating submodules on make

When  running make, the submodule update will remove all local changes.
Adding flag --rebase or --merge does solve the issue. rebase will
probably make it cleaner, but it might stop on conflict, thus --merge
will result in fewer (probably none).
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 84816a19e..525d3a197 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
 init:
-	@@if [ -d .git ]; then git submodule update --init --recursive; fi
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
 jquery: init ${JQ}
 jq: init ${JQ}

From 22738e0e4b988f8ce2cb341b137ba0fe4646d3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 20:15:44 +0100
Subject: [PATCH 17/80] Remove jq target

remove obsolete jq target
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 525d3a197..3223b8da4 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ init:
 	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
 jquery: init ${JQ}
-jq: init ${JQ}
 
 ${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}

From 4f9e78616ecd9ca403a25ee0e3dc71781484e553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 20:14:15 +0100
Subject: [PATCH 18/80] Change makefile order to only update submodules on
 'all' target

insterad of always update the submodules, now only "make all" will run
that, thus an "make jquery" will not update them
---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3223b8da4..9ef44cff1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,16 +42,13 @@ VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: jquery min lint
+all: update_submodules jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-init:
-	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
-
-jquery: init ${JQ}
+jquery: ${JQ}
 
 ${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}
@@ -98,6 +95,10 @@ distclean: clean
 	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
+# change pointers for submodules and update them to what is specified in jQuery
+update_submodules:
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
+
 # update the submodules to the latest at the most logical branch
 pull_submodules:
 	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"

From b4acb7ae819563c3b75bbdabfaf2662fd24b06e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 20:16:19 +0100
Subject: [PATCH 19/80] updating phony rules

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9ef44cff1..d377c4cf6 100644
--- a/Makefile
+++ b/Makefile
@@ -107,4 +107,4 @@ pull_submodules:
 pull: pull_submodules
 	@@git pull ${REMOTE} ${BRANCH}
 
-.PHONY: all jquery lint min init jq clean
+.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull

From e2dd8916eef1daba1a56a5ff1fbb44cb3385f4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 20:26:45 +0100
Subject: [PATCH 20/80] Adding core target

Adding core target to do jquery, minimization and lint
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d377c4cf6..99e742d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,9 @@ VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: update_submodules jquery min lint
+all: update_submodules core
+
+core: jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -107,4 +109,4 @@ pull_submodules:
 pull: pull_submodules
 	@@git pull ${REMOTE} ${BRANCH}
 
-.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull
+.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull core

From 8a1156da9b835d826bfb4b82c41bcdd0d87aff05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 20:40:07 +0100
Subject: [PATCH 21/80] merge doesn't work when init

sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 99e742d6c..2c7bb8085 100644
--- a/Makefile
+++ b/Makefile
@@ -98,8 +98,16 @@ distclean: clean
 	@@rm -rf test/qunit src/sizzle
 
 # change pointers for submodules and update them to what is specified in jQuery
+# --merge  doesn't work when doing an initial clone, thus test if we have non-existing
+#  submodules, then do an real update
 update_submodules:
-	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
+	@@if [ -d .git ]; then \
+		if git submodule status | grep -q -E '^-'; then \
+			git submodule update --init --recursive; \
+		else \
+			git submodule update --init --recursive --merge; \
+		fi; \
+	fi;
 
 # update the submodules to the latest at the most logical branch
 pull_submodules:

From c3c507e900fceb419628157504004ab2813b7d01 Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Thu, 24 Mar 2011 15:41:46 -0400
Subject: [PATCH 22/80] Added css hook to work around bug in WebKit computed
 margin-right. Fixes #3333 - .css("marginRight") is incorrect in WebKit

---
 src/css.js       | 19 +++++++++++++++++++
 src/support.js   | 14 +++++++++++++-
 test/unit/css.js | 12 ++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/css.js b/src/css.js
index 8a982312f..d6b488139 100644
--- a/src/css.js
+++ b/src/css.js
@@ -240,6 +240,25 @@ if ( !jQuery.support.opacity ) {
 	};
 }
 
+jQuery(function() {
+	// This hook cannot be added until DOM ready because the support test
+	// for it is not run until after DOM ready
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				var ret = "0px",
+					display = elem.style.display;
+				elem.style.display = "inline-block";
+				ret = getComputedStyle( elem, "margin-right", "margin-right" );
+				elem.style.display = display;
+				return ret;
+			}
+		}
+	}
+});
+
 if ( document.defaultView && document.defaultView.getComputedStyle ) {
 	getComputedStyle = function( elem, newName, name ) {
 		var ret, defaultView, computedStyle;
diff --git a/src/support.js b/src/support.js
index 7470b33e8..939ad4fcb 100644
--- a/src/support.js
+++ b/src/support.js
@@ -67,7 +67,8 @@
 		boxModel: null,
 		inlineBlockNeedsLayout: false,
 		shrinkWrapBlocks: false,
-		reliableHiddenOffsets: true
+		reliableHiddenOffsets: true,
+		reliableMarginRight: true
 	};
 
 	input.checked = true;
@@ -188,6 +189,17 @@
 		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
 		div.innerHTML = "";
 
+		// Check if div with explicit width and no margin-right incorrectly
+		// gets computed margin-right based on width of container. For more
+		// info see bug #3333
+		// Fails in WebKit before Feb 2011 nightlies
+		// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+		if ( document.defaultView && document.defaultView.getComputedStyle ) {
+			div.style.width = "1px";
+			div.style.marginRight = "0";
+			jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div).marginRight, 10) || 0 ) === 0;
+		}
+
 		body.removeChild( div ).style.display = "none";
 		div = tds = null;
 	});
diff --git a/test/unit/css.js b/test/unit/css.js
index 555f13575..8ae8fcb34 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -333,3 +333,15 @@ test("internal ref to elem.runtimeStyle (bug #7608)", function () {
 
 	ok( result, "elem.runtimeStyle does not throw exception" );
 });
+
+test("marginRight computed style (bug #3333)", function() {
+	expect(1);
+
+	var $div = jQuery("#foo");
+	$div.css({
+		width: "1px",
+		marginRight: 0
+	});
+
+	equals($div.css("marginRight"), "0px");
+});

From e8f4629b924cae0b0f1847d2368031f06bc08149 Mon Sep 17 00:00:00 2001
From: Michael Murray <mmurray.wa@gmail.com>
Date: Thu, 24 Mar 2011 19:02:38 -0400
Subject: [PATCH 23/80] Offset setter for fixed position elements in Webkit.
 Fixes #8316.

---
 src/offset.js       |  4 ++--
 test/unit/offset.js | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/offset.js b/src/offset.js
index 1003c400c..18261bb57 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -181,10 +181,10 @@ jQuery.offset = {
 			curOffset = curElem.offset(),
 			curCSSTop = jQuery.css( elem, "top" ),
 			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			calculatePosition = ((position === "absolute" || position === "fixed") && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
 			props = {}, curPosition = {}, curTop, curLeft;
 
-		// need to be able to calculate position if either top or left is auto and position is absolute
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
 		if ( calculatePosition ) {
 			curPosition = curElem.position();
 		}
diff --git a/test/unit/offset.js b/test/unit/offset.js
index 329d69f95..b7f72a0cd 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -422,6 +422,21 @@ test("offsetParent", function(){
 	equals( div[1], jQuery("#nothiddendiv")[0], "The div is the offsetParent." );
 });
 
+testoffset("bug_8316", function( jQuery ){
+  expect(2);
+  
+  var tests = [
+    { id:'#elem', top: 100, left: 100 }
+  ];
+  
+  jQuery.each(tests, function(){
+    var el = jQuery(this.id);
+    el.offset({ top: this.top, left: this.left});
+    equals(Math.round(el.offset().top), this.top);
+    equals(Math.round(el.offset().left), this.left);
+  });
+});
+
 function testoffset(name, fn) {
 
 	test(name, function() {
@@ -447,7 +462,7 @@ function testoffset(name, fn) {
 	function loadFixture() {
 		var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000, 10 ),
 			iframe = jQuery('<iframe />').css({
-				width: 500, height: 500, position: 'absolute', top: -600, left: -600, visiblity: 'hidden'
+				width: 500, height: 500, position: 'absolute', top: -600, left: -600, visibility: 'hidden'
 			}).appendTo('body')[0];
 		iframe.contentWindow.location = src;
 		return iframe;

From 53697d10efc25ff4fe2bfdd049b4967b7ab507e6 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 19:36:38 -0400
Subject: [PATCH 24/80] Fix missing semicolon.

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

diff --git a/src/css.js b/src/css.js
index d6b488139..1e3f6c166 100644
--- a/src/css.js
+++ b/src/css.js
@@ -255,7 +255,7 @@ jQuery(function() {
 				elem.style.display = display;
 				return ret;
 			}
-		}
+		};
 	}
 });
 

From 5ee4eefb9eb9f571f33afcb9462d9a2f6f8e5547 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 19:40:09 -0400
Subject: [PATCH 25/80] Updating Sizzle submodule to bring in the latest
 commit.

---
 src/sizzle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sizzle b/src/sizzle
index ef19279f5..06250790b 160000
--- a/src/sizzle
+++ b/src/sizzle
@@ -1 +1 @@
-Subproject commit ef19279f54ba49242c6461d47577c703f4f4e80e
+Subproject commit 06250790bc503bf5a1cb3bd4d70b79a8187d9f6d

From 7b985c4ca0cc687998302483000f2dcf9dcb9bce Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 19:52:45 -0400
Subject: [PATCH 26/80] Oops, that test file for bug #8316 was needed - was
 also missing an include and was causing errors.

---
 test/data/offset/bug_8316.html | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 test/data/offset/bug_8316.html

diff --git a/test/data/offset/bug_8316.html b/test/data/offset/bug_8316.html
new file mode 100644
index 000000000..ce32a2826
--- /dev/null
+++ b/test/data/offset/bug_8316.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>bug_8316</title>
+		<style type="text/css" media="screen">
+			#elem {
+          background-color: #000;
+          height: 100px;
+          width: 100px;
+          position: fixed;
+      }
+		</style>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/deferred.js"></script>
+		<script src="../../../src/support.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/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
+	</head>
+	<body>
+		<p> Some foo text </p>
+    <div id="elem"></div>
+	</body>
+</html>

From 735a949a0649f0299e8e4d87b259290970a68ddf Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Thu, 24 Mar 2011 19:55:55 -0400
Subject: [PATCH 27/80] Further fix for #3333, refactored marginRight css hook
 to use jQuery.swap and computed. Thanks timmywil

---
 src/css.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/css.js b/src/css.js
index 1e3f6c166..2eeef6cc9 100644
--- a/src/css.js
+++ b/src/css.js
@@ -248,11 +248,14 @@ jQuery(function() {
 			get: function( elem, computed ) {
 				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
 				// Work around by temporarily setting element display to inline-block
-				var ret = "0px",
-					display = elem.style.display;
-				elem.style.display = "inline-block";
-				ret = getComputedStyle( elem, "margin-right", "margin-right" );
-				elem.style.display = display;
+				var ret;
+				jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						ret = curCSS( elem, "margin-right", "marginRight" );
+					} else {
+						ret = elem.style.marginRight;
+					}
+				});
 				return ret;
 			}
 		};

From d86c48679aeedf8a77ddc75b130f0babc6aa6336 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 20:08:40 -0400
Subject: [PATCH 28/80] Land new sizzle commit.

---
 src/sizzle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sizzle b/src/sizzle
index 06250790b..f12b93092 160000
--- a/src/sizzle
+++ b/src/sizzle
@@ -1 +1 @@
-Subproject commit 06250790bc503bf5a1cb3bd4d70b79a8187d9f6d
+Subproject commit f12b9309269ba7e705a99efe099f86ed1fe98d58

From 2d80710ab00a4f3e8420b315ce5e5137d562afda Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 20:12:31 -0400
Subject: [PATCH 29/80] Tagging the 1.5.2rc1 release.

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

diff --git a/version.txt b/version.txt
index 0b7675087..f1d9951e5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.2pre
\ No newline at end of file
+1.5.2rc1
\ No newline at end of file

From 23e8cc560809fa108c922f8930eeaef775867ce8 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 24 Mar 2011 20:12:40 -0400
Subject: [PATCH 30/80] Updating the source version to 1.5.2pre.

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

diff --git a/version.txt b/version.txt
index f1d9951e5..0b7675087 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.2rc1
\ No newline at end of file
+1.5.2pre
\ No newline at end of file

From ef0157d19138471b497b8575e56df428e0986a7c Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Mon, 28 Mar 2011 12:10:16 -0400
Subject: [PATCH 31/80] Bug #8635 Firefox uncaught exception

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

diff --git a/src/support.js b/src/support.js
index 939ad4fcb..095866b9c 100644
--- a/src/support.js
+++ b/src/support.js
@@ -197,7 +197,7 @@
 		if ( document.defaultView && document.defaultView.getComputedStyle ) {
 			div.style.width = "1px";
 			div.style.marginRight = "0";
-			jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div).marginRight, 10) || 0 ) === 0;
+			jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div, null).marginRight, 10) || 0 ) === 0;
 		}
 
 		body.removeChild( div ).style.display = "none";

From 2555a5a2322f78fc1cfc8a0f2b55580fc79d2f32 Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Mon, 28 Mar 2011 13:10:12 -0400
Subject: [PATCH 32/80] Update the Sizzle location to point to the newly-moved
 repo.

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 80ce23688..19c60418e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/sizzle"]
 	path = src/sizzle
-	url = git://github.com/jeresig/sizzle.git
+	url = git://github.com/jquery/sizzle.git
 [submodule "test/qunit"]
 	path = test/qunit
 	url = git://github.com/jquery/qunit.git

From f2ce87df8ef933dc3372b7d7ab8ea6e54dcd66b6 Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Wed, 30 Mar 2011 18:54:32 +0200
Subject: [PATCH 33/80] Fixes #8692. Strange FF4 bug: values changed onto the
 arguments object sometimes end up as undefined values outside the $.when
 method. Cloning the object into a fresh array solves the issue.

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

diff --git a/src/deferred.js b/src/deferred.js
index f0d7c08c5..90f9c8089 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -144,7 +144,10 @@ jQuery.extend({
 			return function( value ) {
 				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
 				if ( !( --count ) ) {
-					deferred.resolveWith( deferred, args );
+					// Strange bug in FF4:
+					// Values changed onto the arguments object sometimes end up as undefined values
+					// outside the $.when method. Cloning the object into a fresh array solves the issue
+					deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) );
 				}
 			};
 		}

From ad4152709cd7c7b7fdafd2dc0b266fd273aff5d5 Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Wed, 30 Mar 2011 21:21:49 -0400
Subject: [PATCH 34/80] Fixes #8203. Remove some misguided nulling of elements
 done in the name of IE memory cleanup. Based on a patch by davidmurdoch in
 pull 226.

---
 src/offset.js  |  1 -
 src/support.js | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/offset.js b/src/offset.js
index 18261bb57..972278c8d 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -151,7 +151,6 @@ jQuery.offset = {
 		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
 		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
 		jQuery.offset.initialize = jQuery.noop;
 	},
 
diff --git a/src/support.js b/src/support.js
index 095866b9c..4c309562f 100644
--- a/src/support.js
+++ b/src/support.js
@@ -86,15 +86,15 @@
 				script = document.createElement("script"),
 				id = "script" + jQuery.now();
 
+			// Make sure that the execution of code works by injecting a script
+			// tag with appendChild/createTextNode
+			// (IE doesn't support this, fails, and uses .text instead)
 			try {
 				script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
 			} catch(e) {}
 
 			root.insertBefore( script, root.firstChild );
 
-			// Make sure that the execution of code works by injecting a script
-			// tag with appendChild/createTextNode
-			// (IE doesn't support this, fails, and uses .text instead)
 			if ( window[ id ] ) {
 				_scriptEval = true;
 				delete window[ id ];
@@ -103,8 +103,6 @@
 			}
 
 			root.removeChild( script );
-			// release memory in IE
-			root = script = id  = null;
 		}
 
 		return _scriptEval;
@@ -223,8 +221,6 @@
 			el.setAttribute(eventName, "return;");
 			isSupported = typeof el[eventName] === "function";
 		}
-		el = null;
-
 		return isSupported;
 	};
 

From 6c28a394c2174c51196cd9ac073b819fc79adb3b Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Wed, 30 Mar 2011 21:59:38 -0400
Subject: [PATCH 35/80] Remove crossDomain:null comment, it's not needed since
 undefined==null below.

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

diff --git a/src/ajax.js b/src/ajax.js
index 570285af5..d94abd6fc 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -319,7 +319,6 @@ jQuery.extend({
 		cache: null,
 		traditional: false,
 		headers: {},
-		crossDomain: null,
 		*/
 
 		accepts: {

From f9cc5597a47e8a95b13fa5599e94c20fe80903e0 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Thu, 31 Mar 2011 02:55:16 -0400
Subject: [PATCH 36/80] Fix test cases for bug #8316 fix.

- Removed special page, just needed another test in the fixed offset tests

- Checks it's position related to scrolling
---
 src/offset.js                  |  6 +++---
 test/data/offset/bug_8316.html | 30 ------------------------------
 test/data/offset/fixed.html    |  1 +
 test/unit/offset.js            | 30 +++++++++++++-----------------
 4 files changed, 17 insertions(+), 50 deletions(-)
 delete mode 100644 test/data/offset/bug_8316.html

diff --git a/src/offset.js b/src/offset.js
index 972278c8d..a0cd7a156 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -37,8 +37,8 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 			win = getWindow(doc),
 			clientTop  = docElem.clientTop  || body.clientTop  || 0,
 			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
-			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
+			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
+			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
 			top  = box.top  + scrollTop  - clientTop,
 			left = box.left + scrollLeft - clientLeft;
 
@@ -180,7 +180,7 @@ jQuery.offset = {
 			curOffset = curElem.offset(),
 			curCSSTop = jQuery.css( elem, "top" ),
 			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ((position === "absolute" || position === "fixed") && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1,
 			props = {}, curPosition = {}, curTop, curLeft;
 
 		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
diff --git a/test/data/offset/bug_8316.html b/test/data/offset/bug_8316.html
deleted file mode 100644
index ce32a2826..000000000
--- a/test/data/offset/bug_8316.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>bug_8316</title>
-		<style type="text/css" media="screen">
-			#elem {
-          background-color: #000;
-          height: 100px;
-          width: 100px;
-          position: fixed;
-      }
-		</style>
-		<script src="../../../src/core.js"></script>
-		<script src="../../../src/deferred.js"></script>
-		<script src="../../../src/support.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/data.js"></script>
-		<script src="../../../src/event.js"></script>
-		<script src="../../../src/css.js"></script>
-		<script src="../../../src/offset.js"></script>
-	</head>
-	<body>
-		<p> Some foo text </p>
-    <div id="elem"></div>
-	</body>
-</html>
diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
index 3181718da..81ba4ca7d 100644
--- a/test/data/offset/fixed.html
+++ b/test/data/offset/fixed.html
@@ -35,6 +35,7 @@
 	<body>
 		<div id="fixed-1" class="fixed"></div>
 		<div id="fixed-2" class="fixed"></div>
+		<div id="fixed-no-top-left" class="fixed"></div>
 		<div id="forceScroll"></div>
 		<div id="marker"></div>
 		<p class="instructions">Click the white box to move the marker to it.</p>
diff --git a/test/unit/offset.js b/test/unit/offset.js
index b7f72a0cd..ae0518849 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -265,7 +265,7 @@ testoffset("static", function( jQuery ) {
 });
 
 testoffset("fixed", function( jQuery ) {
-	expect(28);
+	expect(30);
 
 	jQuery.offset.initialize();
 
@@ -320,6 +320,17 @@ testoffset("fixed", function( jQuery ) {
 			ok( true, 'Fixed position is not supported' );
 		}
 	});
+
+	// Bug 8316
+	var $noTopLeft = jQuery('#fixed-no-top-left');
+	if ( jQuery.offset.supportsFixedPosition ) {
+		equals( $noTopLeft.offset().top,  1007,  "Check offset top for fixed element with no top set" );
+		equals( $noTopLeft.offset().left, 1007, "Check offset left for fixed element with no left set" );
+	} else {
+		// need to have same number of assertions
+		ok( true, 'Fixed position is not supported' );
+		ok( true, 'Fixed position is not supported' );
+	}
 });
 
 testoffset("table", function( jQuery ) {
@@ -422,22 +433,7 @@ test("offsetParent", function(){
 	equals( div[1], jQuery("#nothiddendiv")[0], "The div is the offsetParent." );
 });
 
-testoffset("bug_8316", function( jQuery ){
-  expect(2);
-  
-  var tests = [
-    { id:'#elem', top: 100, left: 100 }
-  ];
-  
-  jQuery.each(tests, function(){
-    var el = jQuery(this.id);
-    el.offset({ top: this.top, left: this.left});
-    equals(Math.round(el.offset().top), this.top);
-    equals(Math.round(el.offset().left), this.left);
-  });
-});
-
-function testoffset(name, fn) {
+function testoffset( name, fn ) {
 
 	test(name, function() {
 		// pause execution for now

From 459bd7f89d112dd6aec97bfd1923bb7d4337243c Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Thu, 31 Mar 2011 09:10:30 -0400
Subject: [PATCH 37/80] Followup commit for #7340 test case; make sure second
 test fires properly on IE by focusing to another element rather than blurring
 off the first.

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

diff --git a/test/unit/event.js b/test/unit/event.js
index 1e40e0f3e..2a6d8a669 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1981,7 +1981,7 @@ test("window resize", function() {
 });
 
 test("focusin bubbles", function() {
-	expect(4);
+	expect(5);
 	
 	var input = jQuery( '<input type="text" />' ).prependTo( "body" ), 
 		order = 0;
@@ -1996,9 +1996,14 @@ test("focusin bubbles", function() {
 
 	// DOM focus method
 	input[0].focus();
+	
+	// To make the next focus test work, we need to take focus off the input.
+	// This will fire another focusin event, so set order to reflect that.
+	order = 1;
+	jQuery("#text1")[0].focus();
+	
 	// jQuery trigger, which calls DOM focus
 	order = 0;
-	input[0].blur();
 	input.trigger( "focus" );
 
 	input.remove();

From a507f719ab6f2836db0e1bd0c0b5231839c458eb Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Thu, 31 Mar 2011 15:28:23 -0400
Subject: [PATCH 38/80] Tagging the 1.5.2 release.

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

diff --git a/version.txt b/version.txt
index 0b7675087..a73b43254 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.2pre
\ No newline at end of file
+1.5.2
\ No newline at end of file

From fcc112f4062cd58113b28bd6eca4ab2eb80ac11d Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Thu, 31 Mar 2011 15:28:33 -0400
Subject: [PATCH 39/80] Updating the source version to 1.6pre.

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

diff --git a/version.txt b/version.txt
index a73b43254..0a0196e21 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.2
\ No newline at end of file
+1.6pre
\ No newline at end of file

From ab4e300919c5b3335e6d6c99ce9b1c314d116f19 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Sun, 6 Mar 2011 22:47:40 -0500
Subject: [PATCH 40/80] Very crude first pass at splitting apart the attr/prop
 logic. Also adding in attrHooks/propHooks. All of it is completely untested.

---
 src/attributes.js | 274 ++++++++++++++++++++++++++++------------------
 1 file changed, 168 insertions(+), 106 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 599721055..e5425a051 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -3,38 +3,37 @@
 var rclass = /[\n\t\r]/g,
 	rspaces = /\s+/,
 	rreturn = /\r/g,
-	rspecialurl = /^(?:href|src|style)$/,
 	rtype = /^(?:button|input)$/i,
 	rfocusable = /^(?:button|input|object|select|textarea)$/i,
 	rclickable = /^a(?:rea)?$/i,
 	rradiocheck = /^(?:radio|checkbox)$/i;
 
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-
 jQuery.fn.extend({
 	attr: function( name, value ) {
 		return jQuery.access( this, name, value, true, jQuery.attr );
 	},
 
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
+	removeAttr: function( name ) {
+		return this.each(function() {
 			if ( this.nodeType === 1 ) {
 				this.removeAttribute( name );
 			}
 		});
 	},
+	
+	prop: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.prop );
+	},
+	
+	removeProp: function( name ) {
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
 
 	addClass: function( value ) {
 		if ( jQuery.isFunction(value) ) {
@@ -275,6 +274,21 @@ jQuery.extend({
 		height: true,
 		offset: true
 	},
+	
+	// TODO: Check to see if any of these are needed anymore?
+	// If not, it may be good to standardize on all-lowercase names instead
+	attrFix: {
+		"for": "htmlFor",
+		"class": "className",
+		readonly: "readOnly",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		tabindex: "tabIndex",
+		usemap: "useMap",
+		frameborder: "frameBorder"
+	},
 
 	attr: function( elem, name, value, pass ) {
 		// don't get/set attributes on text, comment and attribute nodes
@@ -286,104 +300,152 @@ jQuery.extend({
 			return jQuery(elem)[name](value);
 		}
 
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
+		var ret,
+			notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			hooks;
+			
 		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
+		name = notxml && jQuery.attrFix[ name ] || name;
+		
+		hooks = jQuery.attrHooks[ name ];
+		
+		if ( value !== undefined ) {
+			
+			if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
+				return ret;
+			
+			} else {
+				// convert the value to a string (all browsers do this but IE) see #1070
+				value = "" + value;
+				
+				elem.setAttribute( name, value );
+				
+				return value;
+			}
+			
+		} else {
+			
+			if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem )) !== undefined ) {
+				return ret;
+				
+			} else {
+				
+				if ( !jQuery.hasAttr( elem, name ) ) {
+					return undefined;
+				}
 
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
+				var attr = elem.getAttribute( name );
 
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
-					}
+				// Non-existent attributes return null, we normalize to undefined
+				return attr === null ?
+					undefined :
+					attr;
+			}
+		}
+	},
+	
+	hasAttr: function( elem, name ) {
+		// Blackberry 4.7 returns "" from getAttribute #6938
+		return elem.attributes[ name ] || (elem.hasAttribute && elem.hasAttribute( name ));
+	},
+	
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
 				}
 			}
+		},
+		
+		// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+		// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+		tabIndex: {
+			get: function( elem ) {
+				var attributeNode = elem.getAttributeNode( "tabIndex" );
 
-			// If applicable, access the attribute via the DOM 0 way
-			// 'in' checks fail in Blackberry 4.7 #6931
-			if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
-
-					if ( value === null ) {
-						if ( elem.nodeType === 1 ) {
-							elem.removeAttribute( name );
-						}
-
-					} else {
-						elem[ name ] = value;
-					}
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
-				}
-
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
-
+				return attributeNode && attributeNode.specified ?
+					attributeNode.value :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	},
+	
+	// TODO: Check to see if we really need any here.
+	propFix: {},
+	
+	prop: function( elem, name, value ) {
+		var ret, hooks;
+		
+		// Try to normalize/fix the name
+		name = notxml && jQuery.propFix[ name ] || name;
+		
+		hooks = jQuery.propHooks[ name ];
+		
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value )) !== undefined ) {
+				return ret;
+			
+			} else {
+				return (elem[ name ] = value);
+			}
+		
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem )) !== undefined ) {
+				return ret;
+				
+			} else {
 				return elem[ name ];
 			}
-
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
-
-				return elem.style.cssText;
-			}
-
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-			}
-
-			// Ensure that missing attributes return undefined
-			// Blackberry 4.7 returns "" from getAttribute #6938
-			if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
-				return undefined;
-			}
-
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
 		}
-		// Handle everything which isn't a DOM element node
-		if ( set ) {
-			elem[ name ] = value;
-		}
-		return elem[ name ];
-	}
+	},
+	
+	propHooks: {}
 });
 
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "style" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				return elem.getAttribute( name, 2 );
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			return elem.style.cssText;
+		},
+		
+		set: function( elem, value ) {
+			return (elem.style.cssText = "" + value);
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.attrHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+			
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
 })( jQuery );

From de79e8c7e0d1d2243447d59c70a9058eabf56bc3 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Tue, 8 Mar 2011 12:07:05 -0500
Subject: [PATCH 41/80] Make the new attr/prop changes pass the test suite (in
 Webkit).  There are still errors in IE.

+ Added hooks for selected, checked, readonly, disabled to removeAttr if set to falsey

+ Removed all attrs from attrFix, these aren't needed for setAttribute

+ If prop is used for class, do we want a propFix for class?

  - We could just assume the user should know to use className with prop.  I've done the latter for now.

+ Created tests for $.fn.prop and $.fn.removeProp

  - Actually all I did was change broken attr tests to prop where it made sense.
---
 src/attributes.js         |  48 ++++++-----
 src/manipulation.js       |   2 +-
 test/unit/attributes.js   | 177 ++++++++++++++++++++------------------
 test/unit/manipulation.js |   6 +-
 4 files changed, 124 insertions(+), 109 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index e5425a051..cb8128d25 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -36,10 +36,10 @@ jQuery.fn.extend({
 	},
 
 	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
+		if ( jQuery.isFunction( value ) ) {
 			return this.each(function(i) {
 				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
+				self.addClass( value.call(this, i, self.attr("class") || "") );
 			});
 		}
 
@@ -278,19 +278,10 @@ jQuery.extend({
 	// TODO: Check to see if any of these are needed anymore?
 	// If not, it may be good to standardize on all-lowercase names instead
 	attrFix: {
-		"for": "htmlFor",
-		"class": "className",
-		readonly: "readOnly",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		tabindex: "tabIndex",
-		usemap: "useMap",
-		frameborder: "frameBorder"
 	},
 
 	attr: function( elem, name, value, pass ) {
+
 		// don't get/set attributes on text, comment and attribute nodes
 		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
 			return undefined;
@@ -314,6 +305,10 @@ jQuery.extend({
 			if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
 				return ret;
 			
+			} else if ( value === null ) {
+				elem.removeAttribute( name );
+				return undefined;
+				
 			} else {
 				// convert the value to a string (all browsers do this but IE) see #1070
 				value = "" + value;
@@ -329,7 +324,7 @@ jQuery.extend({
 				return ret;
 				
 			} else {
-				
+
 				if ( !jQuery.hasAttr( elem, name ) ) {
 					return undefined;
 				}
@@ -337,16 +332,14 @@ jQuery.extend({
 				var attr = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return attr === null ?
-					undefined :
-					attr;
+				return attr === null ? undefined : attr;
 			}
 		}
 	},
 	
 	hasAttr: function( elem, name ) {
 		// Blackberry 4.7 returns "" from getAttribute #6938
-		return elem.attributes[ name ] || (elem.hasAttribute && elem.hasAttribute( name ));
+		return elem && elem.attributes[ name ] || (elem.hasAttribute && elem.hasAttribute( name ));
 	},
 	
 	attrHooks: {
@@ -361,7 +354,7 @@ jQuery.extend({
 		
 		// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
 		// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-		tabIndex: {
+		tabindex: {
 			get: function( elem ) {
 				var attributeNode = elem.getAttributeNode( "tabIndex" );
 
@@ -375,10 +368,11 @@ jQuery.extend({
 	},
 	
 	// TODO: Check to see if we really need any here.
-	propFix: {},
+	propFix: {
+	},
 	
 	prop: function( elem, name, value ) {
-		var ret, hooks;
+		var ret, hooks, notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem );
 		
 		// Try to normalize/fix the name
 		name = notxml && jQuery.propFix[ name ] || name;
@@ -406,6 +400,20 @@ jQuery.extend({
 	propHooks: {}
 });
 
+// Remove certain attrs if set to false
+jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name ) {
+	jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+		set: function( elem, value ) {
+			if ( !value ) { // '', undefined, false, null will remove attr
+				elem.removeAttribute( name );
+				return false;
+			}
+			elem.setAttribute( name, value );
+			return value;
+		}
+	});
+});
+
 // Some attributes require a special call on IE
 if ( !jQuery.support.hrefNormalized ) {
 	jQuery.each([ "href", "src", "style" ], function( i, name ) {
diff --git a/src/manipulation.js b/src/manipulation.js
index 27f81cc24..81a55cb89 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -377,7 +377,7 @@ function cloneCopyEvent( src, dest ) {
 	}
 }
 
-function cloneFixAttributes(src, dest) {
+function cloneFixAttributes( src, dest ) {
 	// We do not need to do anything for non-Elements
 	if ( dest.nodeType !== 1 ) {
 		return;
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 8cf47bed6..d4284556b 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -3,38 +3,64 @@ module("attributes", { teardown: moduleTeardown });
 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
-  //  overwrites don't occur
-  //  This is simply for better code coverage and future proofing.
-  var propsShouldBe = {
-    "for": "htmlFor",
-    "class": "className",
-    readonly: "readOnly",
-    maxlength: "maxLength",
-    cellspacing: "cellSpacing",
-    rowspan: "rowSpan",
-    colspan: "colSpan",
-    tabindex: "tabIndex",
-    usemap: "useMap",
-    frameborder: "frameBorder"
-  };
-
-  same(propsShouldBe, jQuery.props, "jQuery.props passes integrity check");
+// test("jQuery.props: integrity test", function() {
+// 
+//   expect(1);
+// 
+//   //  This must be maintained and equal jQuery.props
+//   //  Ensure that accidental or erroneous property
+//   //  overwrites don't occur
+//   //  This is simply for better code coverage and future proofing.
+//   var propsShouldBe = {
+//     "for": "htmlFor",
+//     "class": "className",
+//     readonly: "readOnly",
+//     maxlength: "maxLength",
+//     cellspacing: "cellSpacing",
+//     rowspan: "rowSpan",
+//     colspan: "colSpan",
+//     tabindex: "tabIndex",
+//     usemap: "useMap",
+//     frameborder: "frameBorder"
+//   };
+// 
+//   same(propsShouldBe, jQuery.props, "jQuery.props passes integrity check");
+// 
+// });
 
+test("prop", function() {
+	equals( jQuery('#text1').prop('value'), "Test", 'Check for value attribute' );
+	equals( jQuery('#text1').prop('value', "Test2").prop('defaultValue'), "Test", 'Check for defaultValue attribute' );
+	equals( jQuery('#select2').prop('selectedIndex'), 3, 'Check for selectedIndex attribute' );
+	equals( jQuery('#foo').prop('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
+	equals( jQuery('#foo').prop('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
+	equals( jQuery("<option/>").prop("selected"), false, "Check selected attribute on disconnected element." );
+	
+	var body = document.body, $body = jQuery( body );
+	ok( $body.prop('nextSibling') === null, 'Make sure a null expando returns null' );
+	body.foo = 'bar';
+	equals( $body.prop('foo'), 'bar', 'Make sure the expando is preferred over the dom attribute' );
+	body.foo = undefined;
+	ok( $body.attr('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
+	
+	var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
+	optgroup.appendChild( option );
+	select.appendChild( optgroup );
+	equals( jQuery(option).prop("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
+	equals( jQuery(document).prop("nodeName"), "#document", "prop works correctly on document nodes (bug #7451)." );
+	
+	var attributeNode = document.createAttribute("irrelevant"),
+		commentNode = document.createComment("some comment"),
+		textNode = document.createTextNode("some text"),
+		obj = {};
+	jQuery.each( [document, attributeNode, commentNode, textNode, obj, "#firstp"], function( i, ele ) {
+		strictEqual( jQuery(ele).prop("nonexisting"), undefined, "prop works correctly for non existing attributes (bug #7500)." );
+	});
 });
 
 test("attr(String)", function() {
-	expect(37);
+	expect(20);
 
-	// 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' );
 	equals( jQuery('#check1').attr('type'), "checkbox", 'Check for type attribute' );
@@ -51,55 +77,31 @@ test("attr(String)", function() {
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );
-	equals( jQuery('#select2').attr('selectedIndex'), 3, 'Check for selectedIndex attribute' );
-	equals( jQuery('#foo').attr('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
-	equals( jQuery('#foo').attr('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
 
 	// using innerHTML in IE causes href attribute to be serialized to the full path
 	jQuery('<a/>').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
 	equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
-	equals( jQuery("<option/>").attr("selected"), false, "Check selected attribute on disconnected element." );
-
-
 	// Related to [5574] and [5683]
 	var body = document.body, $body = jQuery(body);
 
 	ok( $body.attr('foo') === undefined, 'Make sure that a non existent attribute returns undefined' );
-	ok( $body.attr('nextSibling') === null, 'Make sure a null expando returns null' );
 
 	body.setAttribute('foo', 'baz');
 	equals( $body.attr('foo'), 'baz', 'Make sure the dom attribute is retrieved when no expando is found' );
 
-	body.foo = 'bar';
-	equals( $body.attr('foo'), 'bar', 'Make sure the expando is preferred over the dom attribute' );
-
 	$body.attr('foo','cool');
 	equals( $body.attr('foo'), 'cool', 'Make sure that setting works well when both expando and dom attribute are available' );
 
-	body.foo = undefined;
-	ok( $body.attr('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
-
 	body.removeAttribute('foo'); // Cleanup
 
 	var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
 	optgroup.appendChild( option );
 	select.appendChild( optgroup );
 
-	equals( jQuery(option).attr("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
-
 	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
 	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
 
-	equals( jQuery(document).attr("nodeName"), "#document", "attr works correctly on document nodes (bug #7451)." );
-
-	var attributeNode = document.createAttribute("irrelevant"),
-		commentNode = document.createComment("some comment"),
-		textNode = document.createTextNode("some text"),
-		obj = {};
-	jQuery.each( [document, attributeNode, commentNode, textNode, obj, "#firstp"], function( i, ele ) {
-		strictEqual( jQuery(ele).attr("nonexisting"), undefined, "attr works correctly for non existing attributes (bug #7500)." );
-	});
 });
 
 if ( !isLocal ) {
@@ -133,7 +135,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(30);
+	expect(24);
 
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
@@ -153,7 +155,7 @@ test("attr(String, Object)", function() {
 	jQuery("#name").attr('name', 'something');
 	equals( jQuery("#name").attr('name'), 'something', 'Set name attribute' );
 	jQuery("#name").attr('name', null);
-	equals( jQuery("#name").attr('title'), '', 'Remove name attribute' );
+	equals( jQuery("#name").attr('name'), undefined, 'Remove name attribute' );
 	jQuery("#check2").attr('checked', true);
 	equals( document.getElementById('check2').checked, true, 'Set checked attribute' );
 	jQuery("#check2").attr('checked', false);
@@ -163,28 +165,28 @@ test("attr(String, Object)", function() {
 	jQuery("#text1").attr('readonly', false);
 	equals( document.getElementById('text1').readOnly, false, 'Set readonly attribute' );
 	jQuery("#name").attr('maxlength', '5');
-	equals( document.getElementById('name').maxLength, '5', 'Set maxlength attribute' );
+	equals( document.getElementById('name').maxLength, 5, 'Set maxlength attribute' );
 	jQuery("#name").attr('maxLength', '10');
-	equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' );
+	equals( document.getElementById('name').maxLength, 10, 'Set maxlength attribute' );
 
-	var attributeNode = document.createAttribute("irrelevant"),
-		commentNode = document.createComment("some comment"),
-		textNode = document.createTextNode("some text"),
-		obj = {};
-	jQuery.each( [document, obj, "#firstp"], function( i, ele ) {
-		var $ele = jQuery( ele );
-		$ele.attr( "nonexisting", "foo" );
-		equal( $ele.attr("nonexisting"), "foo", "attr(name, value) works correctly for non existing attributes (bug #7500)." );
-	});
-	jQuery.each( [commentNode, textNode, attributeNode], function( i, ele ) {
-		var $ele = jQuery( ele );
-		$ele.attr( "nonexisting", "foo" );
-		strictEqual( $ele.attr("nonexisting"), undefined, "attr(name, value) works correctly on comment and text nodes (bug #7500)." );
-	});
-	//cleanup
-	jQuery.each( [document, "#firstp"], function( i, ele ) {
-		jQuery( ele ).removeAttr("nonexisting");
-	});
+	// var attributeNode = document.createAttribute("irrelevant"),
+	// 	commentNode = document.createComment("some comment"),
+	// 	textNode = document.createTextNode("some text"),
+	// 	obj = {};
+	// jQuery.each( [document, obj, "#firstp"], function( i, ele ) {
+	// 	var $ele = jQuery( ele );
+	// 	$ele.attr( "nonexisting", "foo" );
+	// 	equal( $ele.attr("nonexisting"), "foo", "attr(name, value) works correctly for non existing attributes (bug #7500)." );
+	// });
+	// jQuery.each( [commentNode, textNode, attributeNode], function( i, ele ) {
+	// 	var $ele = jQuery( ele );
+	// 	$ele.attr( "nonexisting", "foo" );
+	// 	strictEqual( $ele.attr("nonexisting"), undefined, "attr(name, value) works correctly on comment and text nodes (bug #7500)." );
+	// });
+	// //cleanup
+	// jQuery.each( [document, "#firstp"], function( i, ele ) {
+	// 	jQuery( ele ).removeAttr("nonexisting");
+	// });
 
 	var table = jQuery('#table').append("<tr><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr>"),
 		td = table.find('td:first');
@@ -356,25 +358,29 @@ test("attr('tabindex', value)", function() {
 });
 
 test("removeAttr(String)", function() {
-	expect(7);
+	expect(1);
 	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
 
+});
+
+test("removeProp(String)", function() {
+	expect(6);
 	var attributeNode = document.createAttribute("irrelevant"),
 		commentNode = document.createComment("some comment"),
 		textNode = document.createTextNode("some text"),
 		obj = {};
-	//removeAttr only really removes on DOM element nodes handle all other seperatyl
-	strictEqual( jQuery( "#firstp" ).attr( "nonexisting", "foo" ).removeAttr( "nonexisting" )[0].nonexisting, undefined, "removeAttr works correctly on DOM element nodes" );
+
+	strictEqual( jQuery( "#firstp" ).prop( "nonexisting", "foo" ).removeProp( "nonexisting" )[0].nonexisting, undefined, "removeprop works correctly on DOM element nodes" );
 
 	jQuery.each( [document, obj], function( i, ele ) {
 		var $ele = jQuery( ele );
-		$ele.attr( "nonexisting", "foo" ).removeAttr( "nonexisting" );
-		strictEqual( ele.nonexisting, "", "removeAttr works correctly on non DOM element nodes (bug #7500)." );
+		$ele.prop( "nonexisting", "foo" ).removeProp( "nonexisting" );
+		strictEqual( ele.nonexisting, undefined, "removeProp works correctly on non DOM element nodes (bug #7500)." );
 	});
 	jQuery.each( [commentNode, textNode, attributeNode], function( i, ele ) {
 		$ele = jQuery( ele );
-		$ele.attr( "nonexisting", "foo" ).removeAttr( "nonexisting" );
-		strictEqual( ele.nonexisting, undefined, "removeAttr works correctly on non DOM element nodes (bug #7500)." );
+		$ele.prop( "nonexisting", "foo" ).removeProp( "nonexisting" );
+		strictEqual( ele.nonexisting, undefined, "removeProp works correctly on non DOM element nodes (bug #7500)." );
 	});
 });
 
@@ -604,21 +610,20 @@ test("addClass(Function)", function() {
 
 test("addClass(Function) with incoming value", function() {
 	expect(45);
-
 	var div = jQuery("div"), old = div.map(function(){
-		return jQuery(this).attr("class");
+		return jQuery(this).attr("class") || "";
 	});
-
+	
 	div.addClass(function(i, val) {
-		if ( this.id !== "_firebugConsole" ) {
+		if ( this.id !== "_firebugConsole") {
 			equals( val, old[i], "Make sure the incoming value is correct." );
 			return "test";
 		}
 	});
 
 	var pass = true;
-	for ( var i = 0; i < div.size(); i++ ) {
-	 if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
+	for ( var i = 0; i < div.length; i++ ) {
+		if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
 	}
 	ok( pass, "Add Class" );
 });
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index ff3dff164..e972a4792 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -1009,7 +1009,7 @@ test("clone()", function() {
 });
 
 test("clone(form element) (Bug #3879, #6655)", function() {
-	expect(6);
+	expect(5);
 	var 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" );
@@ -1019,7 +1019,9 @@ test("clone(form element) (Bug #3879, #6655)", function() {
 
 	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.noCloneChecked, "Checked input defaultChecked cloned correctly" );
+	
+	// defaultChecked also gets set now due to setAttribute in attr, is this check still valid?
+	// equals( clone[0].defaultChecked, !jQuery.support.noCloneChecked, "Checked input defaultChecked cloned correctly" );
 
 	element = jQuery("<input type='text' value='foo'>");
 	clone = element.clone();

From 5eecb13fa3391870e904548f03d8a509117984f3 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Wed, 9 Mar 2011 20:20:53 -0500
Subject: [PATCH 42/80] Now passes in IE8, changed around $.hasAttr and
 switched the attrHook for selected to be a propHook

---
 src/attributes.js       | 39 ++++++++++++++++++++++++++++-----------
 test/unit/attributes.js | 34 +++++-----------------------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index cb8128d25..8de5cf80c 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -278,10 +278,11 @@ jQuery.extend({
 	// TODO: Check to see if any of these are needed anymore?
 	// If not, it may be good to standardize on all-lowercase names instead
 	attrFix: {
+		
 	},
 
 	attr: function( elem, name, value, pass ) {
-
+		
 		// don't get/set attributes on text, comment and attribute nodes
 		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
 			return undefined;
@@ -294,9 +295,6 @@ jQuery.extend({
 		var ret,
 			notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
 			hooks;
-			
-		// Try to normalize/fix the name
-		name = notxml && jQuery.attrFix[ name ] || name;
 		
 		hooks = jQuery.attrHooks[ name ];
 		
@@ -312,9 +310,7 @@ jQuery.extend({
 			} else {
 				// convert the value to a string (all browsers do this but IE) see #1070
 				value = "" + value;
-				
 				elem.setAttribute( name, value );
-				
 				return value;
 			}
 			
@@ -332,14 +328,24 @@ jQuery.extend({
 				var attr = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return attr === null ? undefined : attr;
+				return attr === null || attr === "undefined" ? undefined : attr;
 			}
 		}
 	},
 	
 	hasAttr: function( elem, name ) {
-		// Blackberry 4.7 returns "" from getAttribute #6938
-		return elem && elem.attributes[ name ] || (elem.hasAttribute && elem.hasAttribute( name ));
+		var inAttrs, attrs = elem.attributes;
+		
+		if ( elem.hasAttribute ) {
+			return elem.hasAttribute( name );
+		} else {
+			// Browsers do not understand the associative indexes, look for the name in elem.attributes.name
+			for ( var i = 0, l = attrs.length; i < l; i++ ) {
+				if ( attrs[i]["name"] === name ) {
+					return true;
+				}
+			}
+		}
 	},
 	
 	attrHooks: {
@@ -369,9 +375,16 @@ jQuery.extend({
 	
 	// TODO: Check to see if we really need any here.
 	propFix: {
+		
 	},
 	
 	prop: function( elem, name, value ) {
+		
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+			return undefined;
+		}
+		
 		var ret, hooks, notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem );
 		
 		// Try to normalize/fix the name
@@ -440,13 +453,17 @@ if ( !jQuery.support.style ) {
 // Safari mis-reports the default selected property of an option
 // Accessing the parent's selectedIndex property fixes it
 if ( !jQuery.support.optSelected ) {
-	jQuery.attrHooks.selected = {
+	
+	jQuery.propHooks.selected = {
 		get: function( elem ) {
 			var parent = elem.parentNode;
 			
 			if ( parent ) {
 				parent.selectedIndex;
-
+				
+				// TODO: We may need an attrHook for selected that simply defers to prop?
+				// The attr is undefined if the option is created with createElement and not on the DOM
+				
 				// Make sure that it also works with optgroups, see #5701
 				if ( parent.parentNode ) {
 					parent.parentNode.selectedIndex;
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index d4284556b..af423e346 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -3,31 +3,6 @@ module("attributes", { teardown: moduleTeardown });
 var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
-// test("jQuery.props: integrity test", function() {
-// 
-//   expect(1);
-// 
-//   //  This must be maintained and equal jQuery.props
-//   //  Ensure that accidental or erroneous property
-//   //  overwrites don't occur
-//   //  This is simply for better code coverage and future proofing.
-//   var propsShouldBe = {
-//     "for": "htmlFor",
-//     "class": "className",
-//     readonly: "readOnly",
-//     maxlength: "maxLength",
-//     cellspacing: "cellSpacing",
-//     rowspan: "rowSpan",
-//     colspan: "colSpan",
-//     tabindex: "tabIndex",
-//     usemap: "useMap",
-//     frameborder: "frameBorder"
-//   };
-// 
-//   same(propsShouldBe, jQuery.props, "jQuery.props passes integrity check");
-// 
-// });
-
 test("prop", function() {
 	equals( jQuery('#text1').prop('value'), "Test", 'Check for value attribute' );
 	equals( jQuery('#text1').prop('value', "Test2").prop('defaultValue'), "Test", 'Check for defaultValue attribute' );
@@ -41,11 +16,12 @@ test("prop", function() {
 	body.foo = 'bar';
 	equals( $body.prop('foo'), 'bar', 'Make sure the expando is preferred over the dom attribute' );
 	body.foo = undefined;
-	ok( $body.attr('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
+	ok( $body.prop('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
 	
 	var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
 	optgroup.appendChild( option );
 	select.appendChild( optgroup );
+	
 	equals( jQuery(option).prop("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
 	equals( jQuery(document).prop("nodeName"), "#document", "prop works correctly on document nodes (bug #7451)." );
 	
@@ -85,7 +61,7 @@ test("attr(String)", function() {
 	// Related to [5574] and [5683]
 	var body = document.body, $body = jQuery(body);
 
-	ok( $body.attr('foo') === undefined, 'Make sure that a non existent attribute returns undefined' );
+	strictEqual( $body.attr('foo'), undefined, 'Make sure that a non existent attribute returns undefined' );
 
 	body.setAttribute('foo', 'baz');
 	equals( $body.attr('foo'), 'baz', 'Make sure the dom attribute is retrieved when no expando is found' );
@@ -118,8 +94,8 @@ if ( !isLocal ) {
 
 test("attr(String, Function)", function() {
 	expect(2);
-	equals( jQuery('#text1').attr('value', function() { return this.id ;})[0].value, "text1", "Set value from id" );
-	equals( jQuery('#text1').attr('title', function(i) { return i }).attr('title'), "0", "Set value with an index");
+	equals( jQuery('#text1').attr('value', function() { return this.id; })[0].value, "text1", "Set value from id" );
+	equals( jQuery('#text1').attr('title', function(i) { return i; }).attr('title'), "0", "Set value with an index");
 });
 
 test("attr(Hash)", function() {

From 607210e01068224ac613558c0a314ad4a8fba247 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Thu, 10 Mar 2011 18:34:15 -0500
Subject: [PATCH 43/80] Speed up hasAttr a little

---
 src/attributes.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 8de5cf80c..83d02e212 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -334,18 +334,20 @@ jQuery.extend({
 	},
 	
 	hasAttr: function( elem, name ) {
-		var inAttrs, attrs = elem.attributes;
-		
-		if ( elem.hasAttribute ) {
-			return elem.hasAttribute( name );
-		} else {
-			// Browsers do not understand the associative indexes, look for the name in elem.attributes.name
-			for ( var i = 0, l = attrs.length; i < l; i++ ) {
-				if ( attrs[i]["name"] === name ) {
-					return true;
+
+		return elem.hasAttribute ?
+			elem.hasAttribute( name ) :
+			(function() {
+				// Some browsers do not understand the associative indexes
+				// Look for the name in elem.attributes.name
+				var attrs = elem.attributes, i = 0, len = attrs.length;
+				for ( ; i < len; i++ ) {
+					if ( attrs[i]["name"] === name ) {
+						return true;
+					}
 				}
-			}
-		}
+				return false;
+			})();
 	},
 	
 	attrHooks: {

From 4baa213d881a71ffd8557bc587f81d0bc606d63c Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 11 Mar 2011 14:51:57 -0500
Subject: [PATCH 44/80] First proposed solution for IE6/7 get/setAttribute
 quirks.  Needs more testing, but solves some issues

---
 src/attributes.js | 39 ++++++++++++++++++++++++++++++---------
 src/support.js    |  5 ++++-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 83d02e212..ee4dc1bad 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -275,12 +275,6 @@ jQuery.extend({
 		offset: true
 	},
 	
-	// TODO: Check to see if any of these are needed anymore?
-	// If not, it may be good to standardize on all-lowercase names instead
-	attrFix: {
-		
-	},
-
 	attr: function( elem, name, value, pass ) {
 		
 		// don't get/set attributes on text, comment and attribute nodes
@@ -342,7 +336,7 @@ jQuery.extend({
 				// Look for the name in elem.attributes.name
 				var attrs = elem.attributes, i = 0, len = attrs.length;
 				for ( ; i < len; i++ ) {
-					if ( attrs[i]["name"] === name ) {
+					if ( attrs[i].name === name ) {
 						return true;
 					}
 				}
@@ -455,7 +449,7 @@ if ( !jQuery.support.style ) {
 // Safari mis-reports the default selected property of an option
 // Accessing the parent's selectedIndex property fixes it
 if ( !jQuery.support.optSelected ) {
-	
+
 	jQuery.propHooks.selected = {
 		get: function( elem ) {
 			var parent = elem.parentNode;
@@ -475,4 +469,31 @@ if ( !jQuery.support.optSelected ) {
 	};
 }
 
-})( jQuery );
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+
+if ( jQuery.support.attrFix ) {
+	var attrFix = {
+		"for": "htmlFor",
+		"class": "className",
+		readonly: "readOnly",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		tabindex: "tabIndex",
+		usemap: "useMap",
+		frameborder: "frameBorder"
+	};
+	
+	jQuery.each(attrFix, function( key, name ) {
+		jQuery.attrHooks[ key ] = jQuery.extend( jQuery.attrHooks[ key ], {
+			get: function( elem ) {
+				return elem.getAttribute( name );
+			},
+			set: function( elem, value ) {
+				elem.setAttribute( name, value );
+				return value;
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/src/support.js b/src/support.js
index 4c309562f..3ca28d204 100644
--- a/src/support.js
+++ b/src/support.js
@@ -7,8 +7,9 @@
 	var div = document.createElement("div");
 
 	div.style.display = "none";
+	div.setAttribute("className", "t");
 	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
+	
 	var all = div.getElementsByTagName("*"),
 		a = div.getElementsByTagName("a")[0],
 		select = document.createElement("select"),
@@ -58,6 +59,8 @@
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
 		optSelected: opt.selected,
 
+		attrFix: div.getAttribute("className") === "t",
+
 		// Will be defined later
 		deleteExpando: true,
 		optDisabled: false,

From 00abeaee17a0eed8422a15ff5d48f4011490953b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 11 Mar 2011 14:57:37 -0500
Subject: [PATCH 45/80] Didn't actually need the hooks anymore

---
 src/attributes.js | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index ee4dc1bad..d6179a126 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -275,6 +275,8 @@ jQuery.extend({
 		offset: true
 	},
 	
+	attrFix: {},
+	
 	attr: function( elem, name, value, pass ) {
 		
 		// don't get/set attributes on text, comment and attribute nodes
@@ -285,11 +287,14 @@ jQuery.extend({
 		if ( pass && name in jQuery.attrFn ) {
 			return jQuery(elem)[name](value);
 		}
-
+        
 		var ret,
 			notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
 			hooks;
 		
+		// Normalize the name if needed
+		name = notxml && jQuery.attrFix[ name ] || name;
+		
 		hooks = jQuery.attrHooks[ name ];
 		
 		if ( value !== undefined ) {
@@ -472,8 +477,8 @@ if ( !jQuery.support.optSelected ) {
 // IE6/7 do not support getting/setting some attributes with get/setAttribute
 
 if ( jQuery.support.attrFix ) {
-	var attrFix = {
-		"for": "htmlFor",
+    jQuery.extend(jQuery.attrFix, {
+        "for": "htmlFor",
 		"class": "className",
 		readonly: "readOnly",
 		maxlength: "maxLength",
@@ -483,17 +488,5 @@ if ( jQuery.support.attrFix ) {
 		tabindex: "tabIndex",
 		usemap: "useMap",
 		frameborder: "frameBorder"
-	};
-	
-	jQuery.each(attrFix, function( key, name ) {
-		jQuery.attrHooks[ key ] = jQuery.extend( jQuery.attrHooks[ key ], {
-			get: function( elem ) {
-				return elem.getAttribute( name );
-			},
-			set: function( elem, value ) {
-				elem.setAttribute( name, value );
-				return value;
-			}
-		});
-	});
+    });
 }
\ No newline at end of file

From ebb8e8e300be5da2671f62e939551bd3c859e81e Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 11 Mar 2011 15:59:34 -0500
Subject: [PATCH 46/80] Fix feature test, accidentally got rid of closure end

---
 src/attributes.js | 11 ++++++-----
 src/support.js    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index d6179a126..82ebe7279 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -475,10 +475,9 @@ if ( !jQuery.support.optSelected ) {
 }
 
 // IE6/7 do not support getting/setting some attributes with get/setAttribute
-
 if ( jQuery.support.attrFix ) {
-    jQuery.extend(jQuery.attrFix, {
-        "for": "htmlFor",
+	jQuery.extend( jQuery.attrFix, {
+		"for": "htmlFor",
 		"class": "className",
 		readonly: "readOnly",
 		maxlength: "maxLength",
@@ -488,5 +487,7 @@ if ( jQuery.support.attrFix ) {
 		tabindex: "tabIndex",
 		usemap: "useMap",
 		frameborder: "frameBorder"
-    });
-}
\ No newline at end of file
+	});
+}
+
+})( jQuery );
\ No newline at end of file
diff --git a/src/support.js b/src/support.js
index 3ca28d204..ebda569f4 100644
--- a/src/support.js
+++ b/src/support.js
@@ -59,7 +59,7 @@
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
 		optSelected: opt.selected,
 
-		attrFix: div.getAttribute("className") === "t",
+		attrFix: div.className === "t",
 
 		// Will be defined later
 		deleteExpando: true,

From 8cd30c62d813af68ccd91cc41adf43b8907f41cf Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 11 Mar 2011 21:28:42 -0500
Subject: [PATCH 47/80] Continuing IE7 testing, conditional attr fixes and
 hooks with feature testing.  Will figure out a way to shorten after the test
 suite passes.

---
 src/attributes.js       | 132 ++++++++++++++++++++--------------------
 src/core.js             |   2 +-
 src/support.js          |   2 +-
 test/unit/attributes.js |   2 +-
 4 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 82ebe7279..ad75a001d 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -16,7 +16,7 @@ jQuery.fn.extend({
 	removeAttr: function( name ) {
 		return this.each(function() {
 			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
+				jQuery.removeAttr( this, name );
 			}
 		});
 	},
@@ -287,68 +287,52 @@ jQuery.extend({
 		if ( pass && name in jQuery.attrFn ) {
 			return jQuery(elem)[name](value);
 		}
-        
+
 		var ret,
 			notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
 			hooks;
-		
+
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
-		
+
 		hooks = jQuery.attrHooks[ name ];
-		
+
 		if ( value !== undefined ) {
-			
+
 			if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
 				return ret;
-			
+
 			} else if ( value === null ) {
-				elem.removeAttribute( name );
+				jQuery.removeAttr( elem, name );
 				return undefined;
-				
+
 			} else {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				value = "" + value;
 				elem.setAttribute( name, value );
 				return value;
 			}
-			
+
 		} else {
-			
+
 			if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem )) !== undefined ) {
 				return ret;
-				
+
 			} else {
-
-				if ( !jQuery.hasAttr( elem, name ) ) {
-					return undefined;
-				}
-
 				var attr = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return attr === null || attr === "undefined" ? undefined : attr;
+				return attr === null || attr === "undefined" || attr === "null" ? undefined : attr;
 			}
 		}
 	},
 	
-	hasAttr: function( elem, name ) {
-
-		return elem.hasAttribute ?
-			elem.hasAttribute( name ) :
-			(function() {
-				// Some browsers do not understand the associative indexes
-				// Look for the name in elem.attributes.name
-				var attrs = elem.attributes, i = 0, len = attrs.length;
-				for ( ; i < len; i++ ) {
-					if ( attrs[i].name === name ) {
-						return true;
-					}
-				}
-				return false;
-			})();
+	// removeAttribute returns boolean in IE6/7
+	// set property to null in that case
+	removeAttr: function( elem, name ) {
+		if ( typeof elem.removeAttribute( name ) === "boolean" ) {
+			elem.setAttribute( name, null );
+		}
 	},
-	
+
 	attrHooks: {
 		type: {
 			set: function( elem, value ) {
@@ -357,20 +341,6 @@ jQuery.extend({
 					jQuery.error( "type property can't be changed" );
 				}
 			}
-		},
-		
-		// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-		// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-		tabindex: {
-			get: function( elem ) {
-				var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-				return attributeNode && attributeNode.specified ?
-					attributeNode.value :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
 		}
 	},
 	
@@ -414,20 +384,64 @@ jQuery.extend({
 	propHooks: {}
 });
 
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !jQuery.support.getSetAttribute ) {
+	jQuery.attrFix = jQuery.extend( jQuery.attrFix, {
+		"for": "htmlFor",
+		"class": "className",
+		readonly: "readOnly",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		tabindex: "tabIndex",
+		usemap: "useMap",
+		frameborder: "frameBorder"
+	});
+
+	// Action attribute in ie6/7 returns form object
+	jQuery.attrHooks.action = jQuery.extend( jQuery.attrHooks.action, {
+		get: function( elem ) {
+			return elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue : elem.getAttribute("action");
+		},
+		set: function( elem, value ) {
+			elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue = value : elem.setAttribute("action", value);
+			return value;
+		}
+	});
+}
+
 // Remove certain attrs if set to false
 jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name ) {
+	name = jQuery.attrFix[ name ] || name;
+	
 	jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 		set: function( elem, value ) {
 			if ( !value ) { // '', undefined, false, null will remove attr
-				elem.removeAttribute( name );
+				jQuery.removeAttr( elem, name );
 				return false;
 			}
+
 			elem.setAttribute( name, value );
 			return value;
 		}
 	});
 });
 
+// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+jQuery.attrHooks[ jQuery.attrFix.tabindex || "tabindex" ] = {
+	get: function( elem ) {
+		var attributeNode = elem.getAttributeNode("tabIndex");
+
+		return attributeNode && attributeNode.specified ?
+			parseInt( attributeNode.value, 10 ) :
+			rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+				0 :
+				undefined;
+	}
+};
+
 // Some attributes require a special call on IE
 if ( !jQuery.support.hrefNormalized ) {
 	jQuery.each([ "href", "src", "style" ], function( i, name ) {
@@ -474,20 +488,4 @@ if ( !jQuery.support.optSelected ) {
 	};
 }
 
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( jQuery.support.attrFix ) {
-	jQuery.extend( jQuery.attrFix, {
-		"for": "htmlFor",
-		"class": "className",
-		readonly: "readOnly",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		tabindex: "tabIndex",
-		usemap: "useMap",
-		frameborder: "frameBorder"
-	});
-}
-
 })( jQuery );
\ No newline at end of file
diff --git a/src/core.js b/src/core.js
index 9312ee288..6b00a0151 100644
--- a/src/core.js
+++ b/src/core.js
@@ -894,4 +894,4 @@ function doScrollCheck() {
 // Expose jQuery to the global object
 return jQuery;
 
-})();
+})();
\ No newline at end of file
diff --git a/src/support.js b/src/support.js
index ebda569f4..8e86c46cf 100644
--- a/src/support.js
+++ b/src/support.js
@@ -59,7 +59,7 @@
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
 		optSelected: opt.selected,
 
-		attrFix: div.className === "t",
+		getSetAttribute: div.className !== "t",
 
 		// Will be defined later
 		deleteExpando: true,
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index af423e346..d32935455 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -824,4 +824,4 @@ test("addClass, removeClass, hasClass", function() {
 	ok( jq.hasClass("cla.ss3")==false, "Check the dotted class has been removed" );
 	jq.removeClass("class4");
 	ok( jq.hasClass("class4")==false, "Check the class has been properly removed" );
-});
+});
\ No newline at end of file

From 9f88fa9165e73b879d0c955fdf81fdd681d2d192 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 15:44:51 -0400
Subject: [PATCH 48/80] Full test suite now passes in all browsers! There are
 probably some tweaks we can make to shorten and simplify.

- removeAttr now only uses setAttribute if camelCase setAttribute is not supported

  + Might want to rename jQuery.support.getSetAttribute

- tabIndex is a special case now for hooks where undefined should be returned.

  + Should we be checking if hooks returns undefined?  undefined might be the desired return value in future hooks.
    As of now, tabIndex is the only one that needs it, but the test suite will still pass if we don't check if hooks are undefined.
---
 src/attributes.js | 16 +++++++++-------
 src/support.js    |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index ad75a001d..64b612617 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -313,7 +313,7 @@ jQuery.extend({
 
 		} else {
 
-			if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem )) !== undefined ) {
+			if ( hooks && "get" in hooks && notxml && ((ret = hooks.get( elem )) !== undefined || name === "tabIndex") ) {
 				return ret;
 
 			} else {
@@ -325,11 +325,13 @@ jQuery.extend({
 		}
 	},
 	
-	// removeAttribute returns boolean in IE6/7
-	// set property to null in that case
+	// removeAttribute returns boolean in IE
+	// set property to null if getSetAttribute not supported (IE6-7)
 	removeAttr: function( elem, name ) {
-		if ( typeof elem.removeAttribute( name ) === "boolean" ) {
-			elem.setAttribute( name, null );
+		name = jQuery.attrFix[ name ] || name;
+		if ( typeof elem.removeAttribute( name ) === "boolean" && !jQuery.support.getSetAttribute ) {
+			// Setting className to null sets a class of "null"
+			name === "className" ? elem.className = "" : elem.setAttribute( name, null );
 		}
 	},
 
@@ -399,7 +401,7 @@ if ( !jQuery.support.getSetAttribute ) {
 		frameborder: "frameBorder"
 	});
 
-	// Action attribute in ie6/7 returns form object
+	// Action attribute in ie6/7 returns form objects
 	jQuery.attrHooks.action = jQuery.extend( jQuery.attrHooks.action, {
 		get: function( elem ) {
 			return elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue : elem.getAttribute("action");
@@ -414,7 +416,7 @@ if ( !jQuery.support.getSetAttribute ) {
 // Remove certain attrs if set to false
 jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name ) {
 	name = jQuery.attrFix[ name ] || name;
-	
+
 	jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 		set: function( elem, value ) {
 			if ( !value ) { // '', undefined, false, null will remove attr
diff --git a/src/support.js b/src/support.js
index 8e86c46cf..b227293d8 100644
--- a/src/support.js
+++ b/src/support.js
@@ -58,7 +58,8 @@
 		// Make sure that a selected-by-default option has a working selected property.
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
 		optSelected: opt.selected,
-
+		
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
 		getSetAttribute: div.className !== "t",
 
 		// Will be defined later

From b85d2cd8a5c49487dc3ea7f6fad963efd9fd0f55 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 16:17:13 -0400
Subject: [PATCH 49/80] Simplify jQuery.removeAttr and return this

---
 src/attributes.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 64b612617..c19b82923 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -325,14 +325,15 @@ jQuery.extend({
 		}
 	},
 	
-	// removeAttribute returns boolean in IE
-	// set property to null if getSetAttribute not supported (IE6-7)
 	removeAttr: function( elem, name ) {
 		name = jQuery.attrFix[ name ] || name;
-		if ( typeof elem.removeAttribute( name ) === "boolean" && !jQuery.support.getSetAttribute ) {
-			// Setting className to null sets a class of "null"
+		
+		jQuery.support.getSetAttribute ? elem.removeAttribute( name ) :
+			// set property to null if getSetAttribute not supported (IE6-7)
+			// setting className to null makes the class "null"
 			name === "className" ? elem.className = "" : elem.setAttribute( name, null );
-		}
+
+		return this;
 	},
 
 	attrHooks: {

From 77c559c3cbe361a87de735a67812695685b613e6 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 16:23:21 -0400
Subject: [PATCH 50/80] No, don't return this.

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

diff --git a/src/attributes.js b/src/attributes.js
index c19b82923..0a39cba8d 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -332,8 +332,6 @@ jQuery.extend({
 			// set property to null if getSetAttribute not supported (IE6-7)
 			// setting className to null makes the class "null"
 			name === "className" ? elem.className = "" : elem.setAttribute( name, null );
-
-		return this;
 	},
 
 	attrHooks: {

From f578e0f99748ec5ae84d750f0922957e5fea25cb Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 16:29:33 -0400
Subject: [PATCH 51/80] Don't use extend when setting the action attrHook for
 IE6/7

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

diff --git a/src/attributes.js b/src/attributes.js
index 0a39cba8d..37a6c1e59 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -401,7 +401,7 @@ if ( !jQuery.support.getSetAttribute ) {
 	});
 
 	// Action attribute in ie6/7 returns form objects
-	jQuery.attrHooks.action = jQuery.extend( jQuery.attrHooks.action, {
+	jQuery.attrHooks.action = {
 		get: function( elem ) {
 			return elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue : elem.getAttribute("action");
 		},
@@ -409,7 +409,7 @@ if ( !jQuery.support.getSetAttribute ) {
 			elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue = value : elem.setAttribute("action", value);
 			return value;
 		}
-	});
+	};
 }
 
 // Remove certain attrs if set to false

From dbe3b7a9d052b7bf0c73ead1ecd43a40152416a0 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 21:27:45 -0400
Subject: [PATCH 52/80] Style edits according to comments from John and
 rwaldron.

---
 src/attributes.js       | 28 +++++++++++++++++++---------
 test/unit/attributes.js | 25 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 37a6c1e59..d045ca67e 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -320,7 +320,9 @@ jQuery.extend({
 				var attr = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return attr === null || attr === "undefined" || attr === "null" ? undefined : attr;
+				return attr === null || attr === "undefined" || attr === "null" ?
+					undefined :
+					attr;
 			}
 		}
 	},
@@ -328,10 +330,17 @@ jQuery.extend({
 	removeAttr: function( elem, name ) {
 		name = jQuery.attrFix[ name ] || name;
 		
-		jQuery.support.getSetAttribute ? elem.removeAttribute( name ) :
+		if ( jQuery.support.getSetAttribute ) {
+			elem.removeAttribute( name )
+		} else {
 			// set property to null if getSetAttribute not supported (IE6-7)
 			// setting className to null makes the class "null"
-			name === "className" ? elem.className = "" : elem.setAttribute( name, null );
+			if ( name === "className" ) {
+				elem.className = ""
+			} else {
+				elem.setAttribute( name, null );
+			}
+		}
 	},
 
 	attrHooks: {
@@ -345,10 +354,7 @@ jQuery.extend({
 		}
 	},
 	
-	// TODO: Check to see if we really need any here.
-	propFix: {
-		
-	},
+	propFix: {},
 	
 	prop: function( elem, name, value ) {
 		
@@ -403,10 +409,14 @@ if ( !jQuery.support.getSetAttribute ) {
 	// Action attribute in ie6/7 returns form objects
 	jQuery.attrHooks.action = {
 		get: function( elem ) {
-			return elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue : elem.getAttribute("action");
+			return elem.nodeName === "FORM" ?
+				elem.getAttributeNode("action").nodeValue :
+				elem.getAttribute("action");
 		},
 		set: function( elem, value ) {
-			elem.nodeName === "FORM" ? elem.getAttributeNode("action").nodeValue = value : elem.setAttribute("action", value);
+			elem.nodeName === "FORM" ?
+				elem.getAttributeNode("action").nodeValue = value :
+				elem.setAttribute("action", value);
 			return value;
 		}
 	};
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index d32935455..8b483dccb 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -3,6 +3,31 @@ module("attributes", { teardown: moduleTeardown });
 var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
+if ( !jQuery.support.getSetAttribute ) {
+	test("jQuery.attrFix integrity test", function() {
+		expect(1);
+
+		//  This must be maintained and equal jQuery.attrFix when appropriate
+		//  Ensure that accidental or erroneous property
+		//  overwrites don't occur
+		//  This is simply for better code coverage and future proofing.
+		var propsShouldBe = {
+			"for": "htmlFor",
+			"class": "className",
+			readonly: "readOnly",
+			maxlength: "maxLength",
+			cellspacing: "cellSpacing",
+			rowspan: "rowSpan",
+			colspan: "colSpan",
+			tabindex: "tabIndex",
+			usemap: "useMap",
+			frameborder: "frameBorder"
+		};
+
+		same(propsShouldBe, jQuery.attrFix, "jQuery.attrFix passes integrity check");
+	});
+}
+
 test("prop", function() {
 	equals( jQuery('#text1').prop('value'), "Test", 'Check for value attribute' );
 	equals( jQuery('#text1').prop('value', "Test2").prop('defaultValue'), "Test", 'Check for defaultValue attribute' );

From 5ac6ca3fa52a4a27d6952c71a77420e3e4a5d88a Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 13 Mar 2011 22:24:45 -0400
Subject: [PATCH 53/80] Restored 6 tests that I had commented to come back to
 later to split up between prop and attr.  All tests still pass in all
 browsers.

- I should make it clear that I have not removed any tests, but only moved some attr tests to prop where I thought it was appropriate.
---
 test/unit/attributes.js | 45 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 8b483dccb..89762e76c 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -28,7 +28,8 @@ if ( !jQuery.support.getSetAttribute ) {
 	});
 }
 
-test("prop", function() {
+test("prop(String)", function() {
+	expect(19);
 	equals( jQuery('#text1').prop('value'), "Test", 'Check for value attribute' );
 	equals( jQuery('#text1').prop('value', "Test2").prop('defaultValue'), "Test", 'Check for defaultValue attribute' );
 	equals( jQuery('#select2').prop('selectedIndex'), 3, 'Check for selectedIndex attribute' );
@@ -57,6 +58,14 @@ test("prop", function() {
 	jQuery.each( [document, attributeNode, commentNode, textNode, obj, "#firstp"], function( i, ele ) {
 		strictEqual( jQuery(ele).prop("nonexisting"), undefined, "prop works correctly for non existing attributes (bug #7500)." );
 	});
+	
+	var obj = {};
+	jQuery.each( [document, obj], function( i, ele ) {
+		var $ele = jQuery( ele );
+		$ele.prop( "nonexisting", "foo" );
+		equal( $ele.prop("nonexisting"), "foo", "prop(name, value) works correctly for non existing attributes (bug #7500)." );
+	});
+	jQuery( document ).removeProp("nonexisting");
 });
 
 test("attr(String)", function() {
@@ -136,7 +145,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(24);
+	expect(28);
 
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
@@ -169,25 +178,19 @@ test("attr(String, Object)", function() {
 	equals( document.getElementById('name').maxLength, 5, 'Set maxlength attribute' );
 	jQuery("#name").attr('maxLength', '10');
 	equals( document.getElementById('name').maxLength, 10, 'Set maxlength attribute' );
-
-	// var attributeNode = document.createAttribute("irrelevant"),
-	// 	commentNode = document.createComment("some comment"),
-	// 	textNode = document.createTextNode("some text"),
-	// 	obj = {};
-	// jQuery.each( [document, obj, "#firstp"], function( i, ele ) {
-	// 	var $ele = jQuery( ele );
-	// 	$ele.attr( "nonexisting", "foo" );
-	// 	equal( $ele.attr("nonexisting"), "foo", "attr(name, value) works correctly for non existing attributes (bug #7500)." );
-	// });
-	// jQuery.each( [commentNode, textNode, attributeNode], function( i, ele ) {
-	// 	var $ele = jQuery( ele );
-	// 	$ele.attr( "nonexisting", "foo" );
-	// 	strictEqual( $ele.attr("nonexisting"), undefined, "attr(name, value) works correctly on comment and text nodes (bug #7500)." );
-	// });
-	// //cleanup
-	// jQuery.each( [document, "#firstp"], function( i, ele ) {
-	// 	jQuery( ele ).removeAttr("nonexisting");
-	// });
+	var $p = jQuery('#firstp').attr('nonexisting', 'foo');
+	equals( $p.attr('nonexisting'), 'foo', "attr(name, value) works correctly for non existing attributes (bug #7500).");
+	$p.removeAttr('nonexisting');
+	
+	var attributeNode = document.createAttribute("irrelevant"),
+		commentNode = document.createComment("some comment"),
+		textNode = document.createTextNode("some text");
+	
+	jQuery.each( [commentNode, textNode, attributeNode], function( i, ele ) {
+		var $ele = jQuery( ele );
+		$ele.attr( "nonexisting", "foo" );
+		strictEqual( $ele.attr("nonexisting"), undefined, "attr(name, value) works correctly on comment and text nodes (bug #7500)." );
+	});
 
 	var table = jQuery('#table').append("<tr><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr>"),
 		td = table.find('td:first');

From 2580420b7e1137acff7ec9fb38c1698e231e1d68 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Tue, 15 Mar 2011 22:47:20 -0400
Subject: [PATCH 54/80] Test description

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

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 89762e76c..b9605d152 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -28,7 +28,7 @@ if ( !jQuery.support.getSetAttribute ) {
 	});
 }
 
-test("prop(String)", function() {
+test("prop(String, Object)", function() {
 	expect(19);
 	equals( jQuery('#text1').prop('value'), "Test", 'Check for value attribute' );
 	equals( jQuery('#text1').prop('value', "Test2").prop('defaultValue'), "Test", 'Check for defaultValue attribute' );

From d28922bc03ea03dd7f02bbc4abc8061ea4c7305b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Wed, 16 Mar 2011 19:00:20 -0400
Subject: [PATCH 55/80] Pass jslint, 2 missing semicolons

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

diff --git a/src/attributes.js b/src/attributes.js
index d045ca67e..972a02f7f 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -331,12 +331,12 @@ jQuery.extend({
 		name = jQuery.attrFix[ name ] || name;
 		
 		if ( jQuery.support.getSetAttribute ) {
-			elem.removeAttribute( name )
+			elem.removeAttribute( name );
 		} else {
 			// set property to null if getSetAttribute not supported (IE6-7)
 			// setting className to null makes the class "null"
 			if ( name === "className" ) {
-				elem.className = ""
+				elem.className = "";
 			} else {
 				elem.setAttribute( name, null );
 			}

From dfeeb872d611c7ff7270fceb7234dd0e04671eb8 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Thu, 17 Mar 2011 22:59:05 -0400
Subject: [PATCH 56/80] Performance enhancement switching nodeType to a var

---
 src/attributes.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 972a02f7f..55d22eb94 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -278,20 +278,20 @@ jQuery.extend({
 	attrFix: {},
 	
 	attr: function( elem, name, value, pass ) {
+		var nType = elem.nodeType;
 		
 		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
 			return undefined;
 		}
 
 		if ( pass && name in jQuery.attrFn ) {
 			return jQuery(elem)[name](value);
 		}
-
-		var ret,
-			notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			hooks;
-
+		
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+		
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
 
@@ -357,13 +357,15 @@ jQuery.extend({
 	propFix: {},
 	
 	prop: function( elem, name, value ) {
+		var nType = elem.nodeType;
 		
 		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
 			return undefined;
 		}
 		
-		var ret, hooks, notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem );
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
 		
 		// Try to normalize/fix the name
 		name = notxml && jQuery.propFix[ name ] || name;

From 11cfdb23940b2c76e1104c82afc9552ac6f3dc19 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Thu, 24 Mar 2011 00:42:00 -0400
Subject: [PATCH 57/80] Non-existent attribute for jQuery.attr no longer needs
 to check for "undefined"

- Remove an unnecessary var

- Use variable in removeAttr for better minification
---
 src/attributes.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 55d22eb94..dc9a333bb 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -317,12 +317,12 @@ jQuery.extend({
 				return ret;
 
 			} else {
-				var attr = elem.getAttribute( name );
+				ret = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return attr === null || attr === "undefined" || attr === "null" ?
+				return ret === null || ret === "null" ?
 					undefined :
-					attr;
+					ret;
 			}
 		}
 	},
@@ -336,7 +336,7 @@ jQuery.extend({
 			// set property to null if getSetAttribute not supported (IE6-7)
 			// setting className to null makes the class "null"
 			if ( name === "className" ) {
-				elem.className = "";
+				elem[ name ] = "";
 			} else {
 				elem.setAttribute( name, null );
 			}

From 102053abd84124b1a69606565bd8da82bc5d30e9 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 00:35:50 -0400
Subject: [PATCH 58/80] Fix #7472 and added test for #3113

- Forms with an input that has either name="action" or name="some-other-attr-on-the-form" caused problems in IE6/7.  This is fixed.

- Changed check in $.attr for ret === null to typeof ret === "object" to catch any inputs that are accidentally retrieved in IE6/7, since attributes cannot be set to objects and typeof null === "object"
---
 src/attributes.js       | 3 ++-
 test/index.html         | 1 +
 test/unit/attributes.js | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index dc9a333bb..564eaeeb8 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -320,7 +320,8 @@ jQuery.extend({
 				ret = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				return ret === null || ret === "null" ?
+				// Instead of checking for null, we check for typeof object to catch inputs in IE6/7. Bug #7472
+				return typeof ret === "object" || ret === "null" ?
 					undefined :
 					ret;
 			}
diff --git a/test/index.html b/test/index.html
index c7c2ae55d..4a8aef529 100644
--- a/test/index.html
+++ b/test/index.html
@@ -203,6 +203,7 @@ Z</textarea>
 			<select name="D4" disabled="disabled">
 				<option selected="selected" value="NO">NO</option>
 			</select>
+			<input name="id">
 		</form>
 		<div id="moretests">
 			<form>
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index b9605d152..5b6144462 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -69,7 +69,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(20);
+	expect(22);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -82,8 +82,10 @@ test("attr(String)", function() {
 	equals( jQuery('#name').attr('name'), "name", 'Check for name attribute' );
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
-	// Temporarily disabled. See: #4299
-	// ok( jQuery('#form').attr('action','newformaction').attr('action').indexOf("newformaction") >= 0, 'Check that action attribute was changed' );
+	// [7472] & [3113] (form contains an input with name="action" or name="id")
+	equals( jQuery('#form').attr('action','newformaction').attr('action'), 'newformaction', 'Check that action attribute was changed' );
+	equals( jQuery('#testForm').removeAttr('id').attr('id'), undefined, 'Test that id does not equal the input with name=id after id is removed [#7472]' );
+	
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );

From 9e05a0a37fcc6fc4985a95370f91e1f792e2273b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 01:46:29 -0400
Subject: [PATCH 59/80] Fix #6562, tighten up the special code for form
 objects, add name attrHook for IE6/7, and don't check for undefined with
 getting hook'd attr

---
 src/attributes.js       | 86 +++++++++++++++++++++--------------------
 test/index.html         |  3 +-
 test/unit/attributes.js | 36 ++++++++++-------
 3 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 564eaeeb8..3c6dee8b4 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -275,7 +275,10 @@ jQuery.extend({
 		offset: true
 	},
 	
-	attrFix: {},
+	attrFix: {
+		// Always normalize to ensure hook usage
+		tabindex: "tabIndex"
+	},
 	
 	attr: function( elem, name, value, pass ) {
 		var nType = elem.nodeType;
@@ -290,7 +293,8 @@ jQuery.extend({
 		}
 		
 		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem ),
+			isFormObjects = !jQuery.support.getSetAttribute && elem.nodeName === "FORM";
 		
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
@@ -307,17 +311,30 @@ jQuery.extend({
 				return undefined;
 
 			} else {
-				elem.setAttribute( name, value );
+				
+				// Check form objects in IE (multiple bugs related)
+				if ( isFormObjects ) {
+					elem.getAttributeNode( name ).nodeValue = value;
+				} else {
+					elem.setAttribute( name, value );
+				}
 				return value;
 			}
 
 		} else {
 
-			if ( hooks && "get" in hooks && notxml && ((ret = hooks.get( elem )) !== undefined || name === "tabIndex") ) {
-				return ret;
+			if ( hooks && "get" in hooks && notxml ) {
+				return hooks.get( elem );
 
 			} else {
-				ret = elem.getAttribute( name );
+				
+				// Check form objects in IE (multiple bugs related)
+				if ( isFormObjects ) {
+					// Returns undefined for empty string, which is the blank nodeValue in IE
+					ret = elem.getAttributeNode( name ).nodeValue || undefined;
+				} else {
+					ret = elem.getAttribute( name );
+				}
 
 				// Non-existent attributes return null, we normalize to undefined
 				// Instead of checking for null, we check for typeof object to catch inputs in IE6/7. Bug #7472
@@ -334,13 +351,9 @@ jQuery.extend({
 		if ( jQuery.support.getSetAttribute ) {
 			elem.removeAttribute( name );
 		} else {
-			// set property to null if getSetAttribute not supported (IE6-7)
-			// setting className to null makes the class "null"
-			if ( name === "className" ) {
-				elem[ name ] = "";
-			} else {
-				elem.setAttribute( name, null );
-			}
+			// use DOM level 1 if getSetAttribute not supported (IE6-7)
+			elem.setAttribute( name, "" ); // Set to default empty string
+			elem.removeAttributeNode( elem.getAttributeNode( name ) );
 		}
 	},
 
@@ -352,6 +365,19 @@ jQuery.extend({
 					jQuery.error( "type property can't be changed" );
 				}
 			}
+		},
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabIndex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
 		}
 	},
 	
@@ -404,23 +430,15 @@ if ( !jQuery.support.getSetAttribute ) {
 		cellspacing: "cellSpacing",
 		rowspan: "rowSpan",
 		colspan: "colSpan",
-		tabindex: "tabIndex",
 		usemap: "useMap",
 		frameborder: "frameBorder"
 	});
-
-	// Action attribute in ie6/7 returns form objects
-	jQuery.attrHooks.action = {
-		get: function( elem ) {
-			return elem.nodeName === "FORM" ?
-				elem.getAttributeNode("action").nodeValue :
-				elem.getAttribute("action");
-		},
-		set: function( elem, value ) {
-			elem.nodeName === "FORM" ?
-				elem.getAttributeNode("action").nodeValue = value :
-				elem.setAttribute("action", value);
-			return value;
+	
+	// Name attribute will not get removed in browsers that do not support getSetAttribute
+	// Return undefined on empty string or null
+	jQuery.attrHooks.name = {
+		get: function( elem, value ) {
+			return elem.getAttributeNode("name").nodeValue || undefined;
 		}
 	};
 }
@@ -442,20 +460,6 @@ jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name
 	});
 });
 
-// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-jQuery.attrHooks[ jQuery.attrFix.tabindex || "tabindex" ] = {
-	get: function( elem ) {
-		var attributeNode = elem.getAttributeNode("tabIndex");
-
-		return attributeNode && attributeNode.specified ?
-			parseInt( attributeNode.value, 10 ) :
-			rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-				0 :
-				undefined;
-	}
-};
-
 // Some attributes require a special call on IE
 if ( !jQuery.support.hrefNormalized ) {
 	jQuery.each([ "href", "src", "style" ], function( i, name ) {
diff --git a/test/index.html b/test/index.html
index 4a8aef529..584f1f864 100644
--- a/test/index.html
+++ b/test/index.html
@@ -203,7 +203,8 @@ Z</textarea>
 			<select name="D4" disabled="disabled">
 				<option selected="selected" value="NO">NO</option>
 			</select>
-			<input name="id">
+			<input name="id" />
+			<input id="target" name="target" />
 		</form>
 		<div id="moretests">
 			<form>
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 5b6144462..adc1d5914 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -3,15 +3,18 @@ module("attributes", { teardown: moduleTeardown });
 var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
-if ( !jQuery.support.getSetAttribute ) {
-	test("jQuery.attrFix integrity test", function() {
-		expect(1);
 
-		//  This must be maintained and equal jQuery.attrFix when appropriate
-		//  Ensure that accidental or erroneous property
-		//  overwrites don't occur
-		//  This is simply for better code coverage and future proofing.
-		var propsShouldBe = {
+test("jQuery.attrFix integrity test", function() {
+	expect(1);
+	
+	//  This must be maintained and equal jQuery.attrFix when appropriate
+	//  Ensure that accidental or erroneous property
+	//  overwrites don't occur
+	//  This is simply for better code coverage and future proofing.
+	var propsShouldBe;
+	if ( !jQuery.support.getSetAttribute ) {
+		propsShouldBe = {
+			tabindex: "tabIndex",
 			"for": "htmlFor",
 			"class": "className",
 			readonly: "readOnly",
@@ -19,14 +22,17 @@ if ( !jQuery.support.getSetAttribute ) {
 			cellspacing: "cellSpacing",
 			rowspan: "rowSpan",
 			colspan: "colSpan",
-			tabindex: "tabIndex",
 			usemap: "useMap",
 			frameborder: "frameBorder"
 		};
+	} else {
+		propsShouldBe = {
+			tabindex: "tabIndex"
+		};
+	}
 
-		same(propsShouldBe, jQuery.attrFix, "jQuery.attrFix passes integrity check");
-	});
-}
+	same(propsShouldBe, jQuery.attrFix, "jQuery.attrFix passes integrity check");
+});
 
 test("prop(String, Object)", function() {
 	expect(19);
@@ -69,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(22);
+	expect(24);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -84,7 +90,9 @@ test("attr(String)", function() {
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
 	// [7472] & [3113] (form contains an input with name="action" or name="id")
 	equals( jQuery('#form').attr('action','newformaction').attr('action'), 'newformaction', 'Check that action attribute was changed' );
-	equals( jQuery('#testForm').removeAttr('id').attr('id'), undefined, 'Test that id does not equal the input with name=id after id is removed [#7472]' );
+	equals( jQuery('#testForm').attr('target'), undefined, 'Retrieving target does not equal the input with name=target' );
+	equals( jQuery('#testForm').attr('target', 'newTarget').attr('target'), 'newTarget', 'Set target successfully on a form' );
+	equals( jQuery('#testForm').removeAttr('id').attr('id'), undefined, 'Retrieving id does not equal the input with name=id after id is removed [#7472]' );
 	
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );

From 47c80c2050fbc15b84cb69edce309777e71b6387 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 02:07:15 -0400
Subject: [PATCH 60/80] Add test for bug#3685, remove added html and add
 dynamicly to avoid global test suite errors

---
 test/index.html         | 2 --
 test/unit/attributes.js | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/index.html b/test/index.html
index 584f1f864..c7c2ae55d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -203,8 +203,6 @@ Z</textarea>
 			<select name="D4" disabled="disabled">
 				<option selected="selected" value="NO">NO</option>
 			</select>
-			<input name="id" />
-			<input id="target" name="target" />
 		</form>
 		<div id="moretests">
 			<form>
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index adc1d5914..96a836f3d 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -75,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(24);
+	expect(25);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -88,11 +88,16 @@ test("attr(String)", function() {
 	equals( jQuery('#name').attr('name'), "name", 'Check for name attribute' );
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+	
 	// [7472] & [3113] (form contains an input with name="action" or name="id")
+	var extras = jQuery('<input name="id" name="name" /><input id="target" name="target" />').appendTo('#testForm');
 	equals( jQuery('#form').attr('action','newformaction').attr('action'), 'newformaction', 'Check that action attribute was changed' );
 	equals( jQuery('#testForm').attr('target'), undefined, 'Retrieving target does not equal the input with name=target' );
 	equals( jQuery('#testForm').attr('target', 'newTarget').attr('target'), 'newTarget', 'Set target successfully on a form' );
 	equals( jQuery('#testForm').removeAttr('id').attr('id'), undefined, 'Retrieving id does not equal the input with name=id after id is removed [#7472]' );
+	// Bug #3685 (form contains input with name="name")
+	equals( jQuery('#testForm').attr('name'), undefined, 'Retrieving name does not retrieve input with name=name' );
+	extras.remove();
 	
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );

From 3892df207d7a4a3babf5017a309263cceff48b65 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 10:40:46 -0400
Subject: [PATCH 61/80] Add test for bug #3116

---
 src/attributes.js       |  2 +-
 test/unit/attributes.js | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 3c6dee8b4..dd4844020 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -330,7 +330,7 @@ jQuery.extend({
 				
 				// Check form objects in IE (multiple bugs related)
 				if ( isFormObjects ) {
-					// Returns undefined for empty string, which is the blank nodeValue in IE
+					// Return undefined for empty string, which is the blank nodeValue in IE
 					ret = elem.getAttributeNode( name ).nodeValue || undefined;
 				} else {
 					ret = elem.getAttribute( name );
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 96a836f3d..161237719 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -160,7 +160,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(28);
+	expect(29);
 
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
@@ -220,9 +220,9 @@ test("attr(String, Object)", function() {
 	jQuery("#name").attr('someAttr', '0');
 	equals( jQuery("#name").attr('someAttr'), '0', 'Set attribute to a string of "0"' );
 	jQuery("#name").attr('someAttr', 0);
-	equals( jQuery("#name").attr('someAttr'), 0, 'Set attribute to the number 0' );
+	equals( jQuery("#name").attr('someAttr'), '0', 'Set attribute to the number 0' );
 	jQuery("#name").attr('someAttr', 1);
-	equals( jQuery("#name").attr('someAttr'), 1, 'Set attribute to the number 1' );
+	equals( jQuery("#name").attr('someAttr'), '1', 'Set attribute to the number 1' );
 
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
@@ -232,7 +232,8 @@ test("attr(String, Object)", function() {
 	j.removeAttr("name");
 
 	QUnit.reset();
-
+	
+	// Type
 	var type = jQuery("#check2").attr('type');
 	var thrown = false;
 	try {
@@ -272,6 +273,13 @@ test("attr(String, Object)", function() {
 	}
 	ok( thrown, "Exception thrown when trying to change type property" );
 	equals( "button", button.attr('type'), "Verify that you can't change the type of a button element" );
+	
+	// Setting attributes on svg elements (bug #3116)
+	var $svg = jQuery('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="3000" height="3000">'
+		+ '<circle cx="200" cy="200" r="150" />'
+	+ '</svg>').appendTo('body');
+	equals( $svg.attr('cx', 100).attr('cx'), "100", "Set attribute on svg element" );
+	$svg.remove();
 });
 
 test("attr(jquery_method)", function(){

From e0900a686d3c80054afd0ebe4c8908a8b5568444 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 21:13:25 -0400
Subject: [PATCH 62/80] Fix issue where non-existant attributes on forms in
 IE6/7 were throwing errors

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

diff --git a/src/attributes.js b/src/attributes.js
index dd4844020..b68b3edf8 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -311,10 +311,11 @@ jQuery.extend({
 				return undefined;
 
 			} else {
-				
+
 				// Check form objects in IE (multiple bugs related)
-				if ( isFormObjects ) {
-					elem.getAttributeNode( name ).nodeValue = value;
+				// Only use nodeValue if the attribute node exists on the form
+				if ( isFormObjects && (ret = elem.getAttributeNode( name )) ) {
+					ret.nodeValue = value;
 				} else {
 					elem.setAttribute( name, value );
 				}
@@ -330,8 +331,9 @@ jQuery.extend({
 				
 				// Check form objects in IE (multiple bugs related)
 				if ( isFormObjects ) {
-					// Return undefined for empty string, which is the blank nodeValue in IE
-					ret = elem.getAttributeNode( name ).nodeValue || undefined;
+					// Return undefined if not specified instead of empty string
+					ret = elem.getAttributeNode( name );
+					return ret && ret.specified ? ret.nodeValue : undefined;
 				} else {
 					ret = elem.getAttribute( name );
 				}
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 161237719..0260a6c1f 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -75,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(25);
+	expect(26);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -88,6 +88,7 @@ test("attr(String)", function() {
 	equals( jQuery('#name').attr('name'), "name", 'Check for name attribute' );
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+	equals( jQuery('#form').attr('blah', 'blah').attr('blah'), 'blah', 'Set non-existant attribute on a form' );
 	
 	// [7472] & [3113] (form contains an input with name="action" or name="id")
 	var extras = jQuery('<input name="id" name="name" /><input id="target" name="target" />').appendTo('#testForm');
@@ -214,7 +215,7 @@ test("attr(String, Object)", function() {
 	td.attr("colspan", "2");
 	equals( td[0].colSpan, 2, "Check colspan is correctly set" );
 	table.attr("cellspacing", "2");
-	equals( table[0].cellSpacing, 2, "Check cellspacing is correctly set" );
+	equals( table[0].cellSpacing, "2", "Check cellspacing is correctly set" );
 
 	// for #1070
 	jQuery("#name").attr('someAttr', '0');
@@ -385,9 +386,9 @@ test("attr('tabindex', value)", function() {
 });
 
 test("removeAttr(String)", function() {
-	expect(1);
+	expect(2);
 	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
-
+	equals( jQuery('#form').removeAttr('id').attr('id'), undefined, 'Remove id' );
 });
 
 test("removeProp(String)", function() {

From 479b28fb6aa7ec5619e1d14c4b0578b9464d5f2b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 22:55:11 -0400
Subject: [PATCH 63/80] Modularize special form code for IE6/7 and clean up
 attr again

---
 src/attributes.js | 68 +++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index b68b3edf8..295a56828 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -6,7 +6,8 @@ var rclass = /[\n\t\r]/g,
 	rtype = /^(?:button|input)$/i,
 	rfocusable = /^(?:button|input|object|select|textarea)$/i,
 	rclickable = /^a(?:rea)?$/i,
-	rradiocheck = /^(?:radio|checkbox)$/i;
+	rradiocheck = /^(?:radio|checkbox)$/i,
+	formHook;
 
 jQuery.fn.extend({
 	attr: function( name, value ) {
@@ -294,31 +295,25 @@ jQuery.extend({
 		
 		var ret, hooks,
 			notxml = nType !== 1 || !jQuery.isXMLDoc( elem ),
-			isFormObjects = !jQuery.support.getSetAttribute && elem.nodeName === "FORM";
+			isFormObjects = !jQuery.support.getSetAttribute && ( name === "name" || elem.nodeName === "FORM" );
 		
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
 
-		hooks = jQuery.attrHooks[ name ];
+		// Get the appropriate hook, or the formHook if getSetAttribute is not supported and we have form objects in IE6/7
+		hooks = isFormObjects && formHook ? formHook( name ) : jQuery.attrHooks[ name ];
 
 		if ( value !== undefined ) {
 
-			if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
-				return ret;
-
-			} else if ( value === null ) {
+			if ( value === null ) {
 				jQuery.removeAttr( elem, name );
 				return undefined;
 
-			} else {
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
+				return ret;
 
-				// Check form objects in IE (multiple bugs related)
-				// Only use nodeValue if the attribute node exists on the form
-				if ( isFormObjects && (ret = elem.getAttributeNode( name )) ) {
-					ret.nodeValue = value;
-				} else {
-					elem.setAttribute( name, value );
-				}
+			} else {
+				elem.setAttribute( name, value );
 				return value;
 			}
 
@@ -328,15 +323,8 @@ jQuery.extend({
 				return hooks.get( elem );
 
 			} else {
-				
-				// Check form objects in IE (multiple bugs related)
-				if ( isFormObjects ) {
-					// Return undefined if not specified instead of empty string
-					ret = elem.getAttributeNode( name );
-					return ret && ret.specified ? ret.nodeValue : undefined;
-				} else {
-					ret = elem.getAttribute( name );
-				}
+
+				ret = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
 				// Instead of checking for null, we check for typeof object to catch inputs in IE6/7. Bug #7472
@@ -353,8 +341,9 @@ jQuery.extend({
 		if ( jQuery.support.getSetAttribute ) {
 			elem.removeAttribute( name );
 		} else {
-			// use DOM level 1 if getSetAttribute not supported (IE6-7)
-			elem.setAttribute( name, "" ); // Set to default empty string
+			// Set to default empty string
+			elem.setAttribute( name, "" );
+			// Attempt to remove completely with DOM level 1
 			elem.removeAttributeNode( elem.getAttributeNode( name ) );
 		}
 	},
@@ -436,12 +425,27 @@ if ( !jQuery.support.getSetAttribute ) {
 		frameborder: "frameBorder"
 	});
 	
-	// Name attribute will not get removed in browsers that do not support getSetAttribute
-	// Return undefined on empty string or null
-	jQuery.attrHooks.name = {
-		get: function( elem, value ) {
-			return elem.getAttributeNode("name").nodeValue || undefined;
-		}
+	// Use this for any attribute on a form in IE6/7
+	// And the name attribute
+	formHook = function( name ) {
+		return jQuery.attrHooks[ name ] || {
+			get: function( elem ) {
+				var ret = elem.getAttributeNode( name );
+				// Return undefined if not specified instead of empty string
+				return ret && ret.specified ? ret.nodeValue : undefined;
+			},
+			set: function( elem, value ) {
+				// Check form objects in IE (multiple bugs related)
+				// Only use nodeValue if the attribute node exists on the form
+				var ret = elem.getAttributeNode( name );
+				if ( ret ) {
+					ret.nodeValue = value;
+				} else {
+					elem.setAttribute( name, value );
+				}
+				return value;
+			}
+		};
 	};
 }
 

From 56014a1a0089be9d8d44c286ce66fc9d2066acd7 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 22:57:01 -0400
Subject: [PATCH 64/80] Shorten even further

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

diff --git a/src/attributes.js b/src/attributes.js
index 295a56828..6011c4501 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -295,13 +295,13 @@ jQuery.extend({
 		
 		var ret, hooks,
 			notxml = nType !== 1 || !jQuery.isXMLDoc( elem ),
-			isFormObjects = !jQuery.support.getSetAttribute && ( name === "name" || elem.nodeName === "FORM" );
+			isFormObjects = formHook && ( name === "name" || elem.nodeName === "FORM" );
 		
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
 
 		// Get the appropriate hook, or the formHook if getSetAttribute is not supported and we have form objects in IE6/7
-		hooks = isFormObjects && formHook ? formHook( name ) : jQuery.attrHooks[ name ];
+		hooks = isFormObjects ? formHook( name ) : jQuery.attrHooks[ name ];
 
 		if ( value !== undefined ) {
 

From 5caf7d837630df4ac8e8fb21c79582dc897903f5 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 23:03:02 -0400
Subject: [PATCH 65/80] Clean up

---
 src/attributes.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 6011c4501..bfeb6c4e1 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -294,14 +294,15 @@ jQuery.extend({
 		}
 		
 		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem ),
-			isFormObjects = formHook && ( name === "name" || elem.nodeName === "FORM" );
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
 		
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
 
 		// Get the appropriate hook, or the formHook if getSetAttribute is not supported and we have form objects in IE6/7
-		hooks = isFormObjects ? formHook( name ) : jQuery.attrHooks[ name ];
+		hooks = formHook && ( name === "name" || elem.nodeName === "FORM" ) ?
+					formHook( name ) :
+					jQuery.attrHooks[ name ];
 
 		if ( value !== undefined ) {
 
@@ -432,7 +433,9 @@ if ( !jQuery.support.getSetAttribute ) {
 			get: function( elem ) {
 				var ret = elem.getAttributeNode( name );
 				// Return undefined if not specified instead of empty string
-				return ret && ret.specified ? ret.nodeValue : undefined;
+				return ret && ret.specified ?
+					ret.nodeValue :
+					undefined;
 			},
 			set: function( elem, value ) {
 				// Check form objects in IE (multiple bugs related)
@@ -482,7 +485,6 @@ if ( !jQuery.support.style ) {
 		get: function( elem ) {
 			return elem.style.cssText;
 		},
-		
 		set: function( elem, value ) {
 			return (elem.style.cssText = "" + value);
 		}

From 448111cbd432864d0ae03c70ae321e97de989e9b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 23:10:59 -0400
Subject: [PATCH 66/80] No longer need to check for objects or string of null
 with the special form treatment and updates to removeAttr

---
 src/attributes.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index bfeb6c4e1..44b16825b 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -328,8 +328,7 @@ jQuery.extend({
 				ret = elem.getAttribute( name );
 
 				// Non-existent attributes return null, we normalize to undefined
-				// Instead of checking for null, we check for typeof object to catch inputs in IE6/7. Bug #7472
-				return typeof ret === "object" || ret === "null" ?
+				return ret === null ?
 					undefined :
 					ret;
 			}

From 03da4c7ca719443d52104c7f47abffc2e312753d Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 25 Mar 2011 23:36:07 -0400
Subject: [PATCH 67/80] Style formatting

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

diff --git a/src/attributes.js b/src/attributes.js
index 44b16825b..c5f9dfbb5 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -290,7 +290,7 @@ jQuery.extend({
 		}
 
 		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
+			return jQuery( elem )[ name ]( value );
 		}
 		
 		var ret, hooks,
@@ -299,7 +299,8 @@ jQuery.extend({
 		// Normalize the name if needed
 		name = notxml && jQuery.attrFix[ name ] || name;
 
-		// Get the appropriate hook, or the formHook if getSetAttribute is not supported and we have form objects in IE6/7
+		// Get the appropriate hook, or the formHook
+		// if getSetAttribute is not supported and we have form objects in IE6/7
 		hooks = formHook && ( name === "name" || elem.nodeName === "FORM" ) ?
 					formHook( name ) :
 					jQuery.attrHooks[ name ];

From 11c97bb06672a1203f39eb39ab373dcc56bd9465 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sat, 26 Mar 2011 00:15:25 -0400
Subject: [PATCH 68/80] Add attribute name to paramaters for hooks

---
 src/attributes.js | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index c5f9dfbb5..6f6345747 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -302,7 +302,7 @@ jQuery.extend({
 		// Get the appropriate hook, or the formHook
 		// if getSetAttribute is not supported and we have form objects in IE6/7
 		hooks = formHook && ( name === "name" || elem.nodeName === "FORM" ) ?
-					formHook( name ) :
+					jQuery.attrHooks[ name ] || formHook :
 					jQuery.attrHooks[ name ];
 
 		if ( value !== undefined ) {
@@ -311,7 +311,7 @@ jQuery.extend({
 				jQuery.removeAttr( elem, name );
 				return undefined;
 
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
 				return ret;
 
 			} else {
@@ -322,7 +322,7 @@ jQuery.extend({
 		} else {
 
 			if ( hooks && "get" in hooks && notxml ) {
-				return hooks.get( elem );
+				return hooks.get( elem, name );
 
 			} else {
 
@@ -428,27 +428,25 @@ if ( !jQuery.support.getSetAttribute ) {
 	
 	// Use this for any attribute on a form in IE6/7
 	// And the name attribute
-	formHook = function( name ) {
-		return jQuery.attrHooks[ name ] || {
-			get: function( elem ) {
-				var ret = elem.getAttributeNode( name );
-				// Return undefined if not specified instead of empty string
-				return ret && ret.specified ?
-					ret.nodeValue :
-					undefined;
-			},
-			set: function( elem, value ) {
-				// Check form objects in IE (multiple bugs related)
-				// Only use nodeValue if the attribute node exists on the form
-				var ret = elem.getAttributeNode( name );
-				if ( ret ) {
-					ret.nodeValue = value;
-				} else {
-					elem.setAttribute( name, value );
-				}
-				return value;
+	formHook = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			// Return undefined if not specified instead of empty string
+			return ret && ret.specified ?
+				ret.nodeValue :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Check form objects in IE (multiple bugs related)
+			// Only use nodeValue if the attribute node exists on the form
+			var ret = elem.getAttributeNode( name );
+			if ( ret ) {
+				ret.nodeValue = value;
+			} else {
+				elem.setAttribute( name, value );
 			}
-		};
+			return value;
+		}
 	};
 }
 

From 217a7abc43967cb860fc0dccee13b475de81b07d Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sat, 26 Mar 2011 00:18:02 -0400
Subject: [PATCH 69/80] Add name to prop hooks as well

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

diff --git a/src/attributes.js b/src/attributes.js
index 6f6345747..70eeecfd5 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -392,7 +392,7 @@ jQuery.extend({
 		hooks = jQuery.propHooks[ name ];
 		
 		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value )) !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
 				return ret;
 			
 			} else {
@@ -400,7 +400,7 @@ jQuery.extend({
 			}
 		
 		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem )) !== undefined ) {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
 				return ret;
 				
 			} else {

From a4d44979c6ecb4be59f1fbb50a0e5eaae804a0d3 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Tue, 29 Mar 2011 00:23:39 -0400
Subject: [PATCH 70/80] Shorten the logic for hooks, ternary was unnecessary

---
 src/attributes.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 70eeecfd5..e80fede93 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -301,9 +301,7 @@ jQuery.extend({
 
 		// Get the appropriate hook, or the formHook
 		// if getSetAttribute is not supported and we have form objects in IE6/7
-		hooks = formHook && ( name === "name" || elem.nodeName === "FORM" ) ?
-					jQuery.attrHooks[ name ] || formHook :
-					jQuery.attrHooks[ name ];
+		hooks = jQuery.attrHooks[ name ] || ( ( name === "name" || elem.nodeName === "FORM" ) && formHook );
 
 		if ( value !== undefined ) {
 

From fa4373c11ba10e040a982a641c74f8ff96f312f3 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Tue, 29 Mar 2011 21:49:37 -0400
Subject: [PATCH 71/80] Add style attribute support tests to $.attr

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

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 0260a6c1f..262f3499e 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -75,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(26);
+	expect(28);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -127,7 +127,10 @@ test("attr(String)", function() {
 
 	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
 	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
-
+	
+	// Check for style support
+	ok( !!~jQuery('#dl').attr('style').indexOf('absolute'), 'Check style attribute getter' );
+	ok( !!~jQuery('#foo').attr('style', 'position:absolute;').attr('style').indexOf('absolute'), 'Check style setter' );
 });
 
 if ( !isLocal ) {

From 1e9b3ef3d87a0934dec969ed469cd3cc9c910ae8 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Wed, 30 Mar 2011 17:13:15 -0400
Subject: [PATCH 72/80] Move the check for the name attribute out of attr and
 down to the formHook definition

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

diff --git a/src/attributes.js b/src/attributes.js
index e80fede93..f03985590 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -301,7 +301,7 @@ jQuery.extend({
 
 		// Get the appropriate hook, or the formHook
 		// if getSetAttribute is not supported and we have form objects in IE6/7
-		hooks = jQuery.attrHooks[ name ] || ( ( name === "name" || elem.nodeName === "FORM" ) && formHook );
+		hooks = jQuery.attrHooks[ name ] || ( elem.nodeName === "FORM" && formHook );
 
 		if ( value !== undefined ) {
 
@@ -426,7 +426,7 @@ if ( !jQuery.support.getSetAttribute ) {
 	
 	// Use this for any attribute on a form in IE6/7
 	// And the name attribute
-	formHook = {
+	formHook = jQuery.attrHooks.name = {
 		get: function( elem, name ) {
 			var ret = elem.getAttributeNode( name );
 			// Return undefined if not specified instead of empty string

From 5fc2281fcc83783b86647a5a86380b9ac21e7f79 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 1 Apr 2011 21:13:01 -0400
Subject: [PATCH 73/80] - Added a hook to swap display none for width and
 height in browsers that do not sufficiently support get/setAttribute

---
 src/attributes.js       | 14 ++++++++++++++
 src/manipulation.js     |  3 ++-
 test/unit/attributes.js | 12 ++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index f03985590..f29c340a3 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -446,6 +446,20 @@ if ( !jQuery.support.getSetAttribute ) {
 			return value;
 		}
 	};
+
+	// Retrieving the width/height attributes on an
+	// element with display: none returns 0 in ie6/7 (#5413)
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret;
+				jQuery.swap( elem, { visibility: "hidden", display: "block" }, function() {
+					ret = elem.getAttribute( name );
+				});
+				return ret;
+			}
+		});
+	});
 }
 
 // Remove certain attrs if set to false
diff --git a/src/manipulation.js b/src/manipulation.js
index 81a55cb89..758cdbae0 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -549,7 +549,8 @@ jQuery.extend({
 
 		// Return the cloned set
 		return clone;
-},
+	},
+
 	clean: function( elems, context, fragment, scripts ) {
 		context = context || document;
 
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 262f3499e..a73b51fc5 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -75,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(28);
+	expect(30);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -125,12 +125,16 @@ test("attr(String)", function() {
 	optgroup.appendChild( option );
 	select.appendChild( optgroup );
 
-	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
-	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
-	
+	var $img = jQuery('<img style="display:none" width="215" height="53" src="http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif"/>').appendTo('body');
+	equals( $img.attr('width'), "215", "Retrieve width attribute an an element with display:none." );
+	equals( $img.attr('height'), "53", "Retrieve height attribute an an element with display:none." );
+
 	// Check for style support
 	ok( !!~jQuery('#dl').attr('style').indexOf('absolute'), 'Check style attribute getter' );
 	ok( !!~jQuery('#foo').attr('style', 'position:absolute;').attr('style').indexOf('absolute'), 'Check style setter' );
+
+	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
+	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
 });
 
 if ( !isLocal ) {

From 8cbf551a48cbc47eccba2050e95745f70166ae1d Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Fri, 1 Apr 2011 21:38:54 -0400
Subject: [PATCH 74/80] #5413 - Much shorter solution for getting width/height
 in ie6 - #8255 Added support for the list attribute in browsers that support
 it (it is automatically readonly, but can be set if using getAttribute( name,
 2)

---
 src/attributes.js       | 16 +---------------
 test/index.html         |  4 ++++
 test/unit/attributes.js |  6 +++++-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index f29c340a3..5afcffce3 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -446,20 +446,6 @@ if ( !jQuery.support.getSetAttribute ) {
 			return value;
 		}
 	};
-
-	// Retrieving the width/height attributes on an
-	// element with display: none returns 0 in ie6/7 (#5413)
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret;
-				jQuery.swap( elem, { visibility: "hidden", display: "block" }, function() {
-					ret = elem.getAttribute( name );
-				});
-				return ret;
-			}
-		});
-	});
 }
 
 // Remove certain attrs if set to false
@@ -481,7 +467,7 @@ jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name
 
 // Some attributes require a special call on IE
 if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "style" ], function( i, name ) {
+	jQuery.each([ "href", "src", "style", "width", "height", "list" ], function( i, name ) {
 		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 			get: function( elem ) {
 				return elem.getAttribute( name, 2 );
diff --git a/test/index.html b/test/index.html
index c7c2ae55d..a10655089 100644
--- a/test/index.html
+++ b/test/index.html
@@ -203,6 +203,10 @@ Z</textarea>
 			<select name="D4" disabled="disabled">
 				<option selected="selected" value="NO">NO</option>
 			</select>
+			<input id="list-test" type="text" />
+			<datalist id="datalist">
+				<option value="option"></option>
+			</datalist>
 		</form>
 		<div id="moretests">
 			<form>
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index a73b51fc5..ad051649f 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -75,7 +75,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(30);
+	expect(31);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -108,6 +108,10 @@ test("attr(String)", function() {
 	jQuery('<a/>').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
 	equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
+	// list attribute is readonly by default in browsers that support it
+	jQuery("#list-test").attr("list", "datalist");
+	equals( jQuery("#list-test").attr("list"), "datalist", "Check setting list attribute" );
+
 	// Related to [5574] and [5683]
 	var body = document.body, $body = jQuery(body);
 

From ff7576755864193b4c1a00464bf0919bbbe96e8b Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sat, 2 Apr 2011 14:23:33 -0400
Subject: [PATCH 75/80] Minor adjustments and cleanup, including normalizing
 the value to a string when setting( list of changes below )

- Normalize set value to string to synchronize return type cross-browser

- Add style attrHook to propHooks to support style getting in all browsers for both attr and prop

- Extend the selected propHook instead of overriding a possible set function

- Remove selected propHook TODO since there is no selected content attribute and it should return null
---
 src/attributes.js | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 5afcffce3..7c03cddbe 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -313,7 +313,7 @@ jQuery.extend({
 				return ret;
 
 			} else {
-				elem.setAttribute( name, value );
+				elem.setAttribute( name, "" + value );
 				return value;
 			}
 
@@ -440,10 +440,8 @@ if ( !jQuery.support.getSetAttribute ) {
 			var ret = elem.getAttributeNode( name );
 			if ( ret ) {
 				ret.nodeValue = value;
-			} else {
-				elem.setAttribute( name, value );
+				return value;
 			}
-			return value;
 		}
 	};
 }
@@ -458,9 +456,6 @@ jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name
 				jQuery.removeAttr( elem, name );
 				return false;
 			}
-
-			elem.setAttribute( name, value );
-			return value;
 		}
 	});
 });
@@ -477,7 +472,7 @@ if ( !jQuery.support.hrefNormalized ) {
 }
 
 if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
+	jQuery.propHooks.style = jQuery.attrHooks.style = {
 		get: function( elem ) {
 			return elem.style.cssText;
 		},
@@ -490,24 +485,20 @@ if ( !jQuery.support.style ) {
 // Safari mis-reports the default selected property of an option
 // Accessing the parent's selectedIndex property fixes it
 if ( !jQuery.support.optSelected ) {
-
-	jQuery.propHooks.selected = {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
 		get: function( elem ) {
 			var parent = elem.parentNode;
-			
+
 			if ( parent ) {
 				parent.selectedIndex;
-				
-				// TODO: We may need an attrHook for selected that simply defers to prop?
-				// The attr is undefined if the option is created with createElement and not on the DOM
-				
+
 				// Make sure that it also works with optgroups, see #5701
 				if ( parent.parentNode ) {
 					parent.parentNode.selectedIndex;
 				}
 			}
 		}
-	};
+	});
 }
 
 })( jQuery );
\ No newline at end of file

From 2a8a2b61488e7857b116bedc9eb75bd971772c2f Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 3 Apr 2011 16:49:48 -0400
Subject: [PATCH 76/80] Move the if statement in jQuery.fn.removeAttr to
 jQuery.removeAttr

- Extra testing on removeAttr and IE form weirdness( all good )
---
 src/attributes.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 7c03cddbe..b472e617c 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -16,9 +16,7 @@ jQuery.fn.extend({
 
 	removeAttr: function( name ) {
 		return this.each(function() {
-			if ( this.nodeType === 1 ) {
-				jQuery.removeAttr( this, name );
-			}
+			jQuery.removeAttr( this, name );
 		});
 	},
 	
@@ -335,15 +333,17 @@ jQuery.extend({
 	},
 	
 	removeAttr: function( elem, name ) {
-		name = jQuery.attrFix[ name ] || name;
+		if ( elem.nodeType === 1 ) {
+			name = jQuery.attrFix[ name ] || name;
 		
-		if ( jQuery.support.getSetAttribute ) {
-			elem.removeAttribute( name );
-		} else {
-			// Set to default empty string
-			elem.setAttribute( name, "" );
-			// Attempt to remove completely with DOM level 1
-			elem.removeAttributeNode( elem.getAttributeNode( name ) );
+			if ( jQuery.support.getSetAttribute ) {
+				elem.removeAttribute( name );
+			} else {
+				// Set to default empty string (No longer need to use attr for this)
+				elem.setAttribute( name, "" );
+				// Attempt to remove completely with DOM level 1
+				elem.removeAttributeNode( elem.getAttributeNode( name ) );
+			}
 		}
 	},
 

From ad2b3bc9f908a8e529c4479c8c9baead23c2d827 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 3 Apr 2011 18:18:32 -0400
Subject: [PATCH 77/80] Found a problem removing the style attribute in IE

- Style is now a special case in IE6/7 to set cssText.  My goal is to avoid calling attr again for the performance benefit, and at this point it would also cause an infinite loop for the boolean attributes hooks such as selected & checked.  Nevertheless, style seems to be the only one requiring a special call.
---
 src/attributes.js       | 27 +++++++++++++++------------
 test/unit/attributes.js | 13 +++++++++----
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index b472e617c..ced9977e4 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -276,7 +276,8 @@ jQuery.extend({
 	
 	attrFix: {
 		// Always normalize to ensure hook usage
-		tabindex: "tabIndex"
+		tabindex: "tabIndex",
+		readonly: "readOnly"
 	},
 	
 	attr: function( elem, name, value, pass ) {
@@ -339,10 +340,14 @@ jQuery.extend({
 			if ( jQuery.support.getSetAttribute ) {
 				elem.removeAttribute( name );
 			} else {
-				// Set to default empty string (No longer need to use attr for this)
-				elem.setAttribute( name, "" );
-				// Attempt to remove completely with DOM level 1
-				elem.removeAttributeNode( elem.getAttributeNode( name ) );
+				// Only style is a special case.
+				if ( name === "style" ) {
+					elem.style.cssText = "";
+				} else {
+					elem.setAttribute( name, "" );
+					// Attempt to remove completely with DOM level 1
+					elem.removeAttributeNode( elem.getAttributeNode( name ) );
+				}
 			}
 		}
 	},
@@ -415,7 +420,6 @@ if ( !jQuery.support.getSetAttribute ) {
 	jQuery.attrFix = jQuery.extend( jQuery.attrFix, {
 		"for": "htmlFor",
 		"class": "className",
-		readonly: "readOnly",
 		maxlength: "maxLength",
 		cellspacing: "cellSpacing",
 		rowspan: "rowSpan",
@@ -447,12 +451,10 @@ if ( !jQuery.support.getSetAttribute ) {
 }
 
 // Remove certain attrs if set to false
-jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name ) {
-	name = jQuery.attrFix[ name ] || name;
-
+jQuery.each([ "selected", "checked", "readOnly", "disabled" ], function( i, name ) {
 	jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 		set: function( elem, value ) {
-			if ( !value ) { // '', undefined, false, null will remove attr
+			if ( !value ) {
 				jQuery.removeAttr( elem, name );
 				return false;
 			}
@@ -472,9 +474,10 @@ if ( !jQuery.support.hrefNormalized ) {
 }
 
 if ( !jQuery.support.style ) {
-	jQuery.propHooks.style = jQuery.attrHooks.style = {
+	jQuery.attrHooks.style = {
 		get: function( elem ) {
-			return elem.style.cssText;
+			// Return undefined in the case of empty string
+			return elem.style.cssText || undefined;
 		},
 		set: function( elem, value ) {
 			return (elem.style.cssText = "" + value);
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index ad051649f..0e86a8bf6 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -15,9 +15,9 @@ test("jQuery.attrFix integrity test", function() {
 	if ( !jQuery.support.getSetAttribute ) {
 		propsShouldBe = {
 			tabindex: "tabIndex",
+			readonly: "readOnly",
 			"for": "htmlFor",
 			"class": "className",
-			readonly: "readOnly",
 			maxlength: "maxLength",
 			cellspacing: "cellSpacing",
 			rowspan: "rowSpan",
@@ -27,7 +27,8 @@ test("jQuery.attrFix integrity test", function() {
 		};
 	} else {
 		propsShouldBe = {
-			tabindex: "tabIndex"
+			tabindex: "tabIndex",
+			readonly: "readOnly"
 		};
 	}
 
@@ -172,7 +173,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(29);
+	expect(30);
 
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
@@ -195,6 +196,8 @@ test("attr(String, Object)", function() {
 	equals( jQuery("#name").attr('name'), undefined, 'Remove name attribute' );
 	jQuery("#check2").attr('checked', true);
 	equals( document.getElementById('check2').checked, true, 'Set checked attribute' );
+	jQuery("#check2").attr('checked', '');
+	equals( document.getElementById('check2').checked, false, 'Setting checked to empty string removes it' );
 	jQuery("#check2").attr('checked', false);
 	equals( document.getElementById('check2').checked, false, 'Set checked attribute' );
 	jQuery("#text1").attr('readonly', true);
@@ -397,9 +400,11 @@ test("attr('tabindex', value)", function() {
 });
 
 test("removeAttr(String)", function() {
-	expect(2);
+	expect(4);
 	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
 	equals( jQuery('#form').removeAttr('id').attr('id'), undefined, 'Remove id' );
+	equals( jQuery('#foo').attr('style', 'position:absolute;').removeAttr('style').attr('style'), undefined, 'Check removing style attribute' );
+	equals( jQuery('#form').attr('style', 'position:absolute;').removeAttr('style').attr('style'), undefined, 'Check removing style attribute on a form' );
 });
 
 test("removeProp(String)", function() {

From 6f79bee3e3ea874f27389a7e691c1bd7541f2ef6 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sun, 3 Apr 2011 18:47:44 -0400
Subject: [PATCH 78/80] Normalize css property names to lowercase for
 comparisons on a .attr('style') call since IE uppercases everything

---
 src/attributes.js       | 3 ++-
 test/unit/attributes.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index ced9977e4..15d4d50e0 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -477,7 +477,8 @@ if ( !jQuery.support.style ) {
 	jQuery.attrHooks.style = {
 		get: function( elem ) {
 			// Return undefined in the case of empty string
-			return elem.style.cssText || undefined;
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
 		},
 		set: function( elem, value ) {
 			return (elem.style.cssText = "" + value);
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 0e86a8bf6..4289bc3b7 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -135,8 +135,8 @@ test("attr(String)", function() {
 	equals( $img.attr('height'), "53", "Retrieve height attribute an an element with display:none." );
 
 	// Check for style support
-	ok( !!~jQuery('#dl').attr('style').indexOf('absolute'), 'Check style attribute getter' );
-	ok( !!~jQuery('#foo').attr('style', 'position:absolute;').attr('style').indexOf('absolute'), 'Check style setter' );
+	ok( !!~jQuery('#dl').attr('style').indexOf('position'), 'Check style attribute getter, also normalize css props to lowercase' );
+	ok( !!~jQuery('#foo').attr('style', 'position:absolute;').attr('style').indexOf('position'), 'Check style setter' );
 
 	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
 	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );

From 17afd80d485b4ca36145a40fd7ac8f81f7099f7c Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sat, 9 Apr 2011 15:56:35 -0400
Subject: [PATCH 79/80] IE8 testing for lowercasing the css properties on
 retrieving style; had assumed the style support check failed in IE8, which it
 now does

---
 src/support.js          | 6 +++---
 test/unit/attributes.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/support.js b/src/support.js
index b227293d8..89d2bfea2 100644
--- a/src/support.js
+++ b/src/support.js
@@ -8,7 +8,7 @@
 
 	div.style.display = "none";
 	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
 	
 	var all = div.getElementsByTagName("*"),
 		a = div.getElementsByTagName("a")[0],
@@ -34,8 +34,8 @@
 		htmlSerialize: !!div.getElementsByTagName("link").length,
 
 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
+		// (IE uses .cssText instead, and capitalizes all property names)
+		style: /top/.test( a.getAttribute("style") ),
 
 		// Make sure that URLs aren't manipulated
 		// (IE normalizes it by default)
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 4289bc3b7..3611b03eb 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -110,8 +110,8 @@ test("attr(String)", function() {
 	equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
 	// list attribute is readonly by default in browsers that support it
-	jQuery("#list-test").attr("list", "datalist");
-	equals( jQuery("#list-test").attr("list"), "datalist", "Check setting list attribute" );
+	jQuery('#list-test').attr('list', 'datalist');
+	equals( jQuery('#list-test').attr('list'), 'datalist', 'Check setting list attribute' );
 
 	// Related to [5574] and [5683]
 	var body = document.body, $body = jQuery(body);

From 3a1b4661f5b8249ce7a741084824ec5445c75719 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Sat, 9 Apr 2011 17:25:06 -0400
Subject: [PATCH 80/80]  #8150 - When removing the width and height attributes
 in IE6/7, setting to "" actually sets to 0 instead of auto

- Having fixed this automatically with the use of removeAttribute in browsers that support it, this will fix it for IE6/7 as well.

- This has no effect on width/height styles set elsewhere( test added to removeAttr )

- With this addition, I need to call attr in removeAttr for IE6/7, which means boolean calls like .attr("checked", "") will no longer remove the attribute, which I think is fine.  .attr("checked", false) will still remove.  If I had left it, it would have gone in an infinite loop since setting to empty string is the only way to remove it in these browsers.

- The hrefNormalized hooks were returning null if they weren't present.  Added the null check to the getter.

- Now that the style support fails in IE8 as well due to uppercasing everything, no need to have style included with the hrefNormalized hooks
---
 src/attributes.js       | 33 +++++++++++++++++++++------------
 test/unit/attributes.js | 10 +++++-----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 15d4d50e0..b4330a86e 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -338,16 +338,11 @@ jQuery.extend({
 			name = jQuery.attrFix[ name ] || name;
 		
 			if ( jQuery.support.getSetAttribute ) {
+				// Use removeAttribute in browsers that support it
 				elem.removeAttribute( name );
 			} else {
-				// Only style is a special case.
-				if ( name === "style" ) {
-					elem.style.cssText = "";
-				} else {
-					elem.setAttribute( name, "" );
-					// Attempt to remove completely with DOM level 1
-					elem.removeAttributeNode( elem.getAttributeNode( name ) );
-				}
+				jQuery.attr( elem, name, "" );
+				elem.removeAttributeNode( elem.getAttributeNode( name ) );
 			}
 		}
 	},
@@ -448,15 +443,28 @@ if ( !jQuery.support.getSetAttribute ) {
 			}
 		}
 	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
 }
 
 // Remove certain attrs if set to false
 jQuery.each([ "selected", "checked", "readOnly", "disabled" ], function( i, name ) {
 	jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 		set: function( elem, value ) {
-			if ( !value ) {
+			if ( value === false ) {
 				jQuery.removeAttr( elem, name );
-				return false;
+				return value;
 			}
 		}
 	});
@@ -464,10 +472,11 @@ jQuery.each([ "selected", "checked", "readOnly", "disabled" ], function( i, name
 
 // Some attributes require a special call on IE
 if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "style", "width", "height", "list" ], function( i, name ) {
+	jQuery.each([ "href", "src", "width", "height", "list" ], function( i, name ) {
 		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
 			get: function( elem ) {
-				return elem.getAttribute( name, 2 );
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
 			}
 		});
 	});
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 3611b03eb..fa30ff042 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -76,7 +76,7 @@ test("prop(String, Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(31);
+	expect(32);
 
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -90,6 +90,7 @@ test("attr(String)", function() {
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
 	equals( jQuery('#form').attr('blah', 'blah').attr('blah'), 'blah', 'Set non-existant attribute on a form' );
+	equals( jQuery('#foo').attr('height'), undefined, 'Non existent height attribute should return undefined' );
 	
 	// [7472] & [3113] (form contains an input with name="action" or name="id")
 	var extras = jQuery('<input name="id" name="name" /><input id="target" name="target" />').appendTo('#testForm');
@@ -173,7 +174,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(30);
+	expect(29);
 
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
@@ -196,8 +197,6 @@ test("attr(String, Object)", function() {
 	equals( jQuery("#name").attr('name'), undefined, 'Remove name attribute' );
 	jQuery("#check2").attr('checked', true);
 	equals( document.getElementById('check2').checked, true, 'Set checked attribute' );
-	jQuery("#check2").attr('checked', '');
-	equals( document.getElementById('check2').checked, false, 'Setting checked to empty string removes it' );
 	jQuery("#check2").attr('checked', false);
 	equals( document.getElementById('check2').checked, false, 'Set checked attribute' );
 	jQuery("#text1").attr('readonly', true);
@@ -400,11 +399,12 @@ test("attr('tabindex', value)", function() {
 });
 
 test("removeAttr(String)", function() {
-	expect(4);
+	expect(5);
 	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
 	equals( jQuery('#form').removeAttr('id').attr('id'), undefined, 'Remove id' );
 	equals( jQuery('#foo').attr('style', 'position:absolute;').removeAttr('style').attr('style'), undefined, 'Check removing style attribute' );
 	equals( jQuery('#form').attr('style', 'position:absolute;').removeAttr('style').attr('style'), undefined, 'Check removing style attribute on a form' );
+	equals( jQuery('#fx-test-group').attr('height', '3px').removeAttr('height').css('height'), "1px", 'Removing height attribute has no effect on height set with style attribute' );
 });
 
 test("removeProp(String)", function() {