From 7164615f6727c67da612fecc63867d30e1b4b4a3 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Tue, 12 Apr 2011 11:48:07 -0400
Subject: [PATCH 01/11] Ticket 8099, Reattempt with iframe

---
 src/effects.js          | 33 +++++++++++++++++++++++++++++----
 test/data/testsuite.css |  3 +++
 test/unit/effects.js    | 13 +++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/effects.js b/src/effects.js
index 7aec8300..73ce33a8 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -548,17 +548,42 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
-	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
+	var stylesheets = document.styleSheets,
+			disabled = [],
+			elem, display, style, idx;
 
+	if ( !elemdisplay[ nodeName ] ) {
+
+		// #8099 - If the end-dev has globally changed a default
+		// display, we can temporarily disable their styles to check
+		// for the correct default value
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			style = stylesheets[ idx ];
+			disabled[ idx ] = style.disabled;
+			style.disabled = true;
+		}
+		
+		// To accurately check an element's default display value, 
+		// create a temp element and check it's default display, this
+		// will ensure that the value returned is not a user-tampered
+		// value.
+		elem = jQuery("<" + nodeName + ">").appendTo("body"),
+		display = elem.css("display");
+		
+		// Remove temp element
 		elem.remove();
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
 		}
-
+		
+		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
+
+		// Restore stylesheets
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			stylesheets[ idx ].disabled = disabled[ idx ];
+		}
 	}
 
 	return elemdisplay[ nodeName ];
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index 02900681..b307d498 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
 #nothiddendiv { font-size: 16px; }
 #nothiddendivchild.em { font-size: 2em; }
 #nothiddendivchild.prct { font-size: 150%; }
+
+/* 8099 changes to default styles are read correctly */
+tt { display: none; }
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 4faf6174..b68b9b6b 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -162,6 +162,19 @@ test("Persist correct display value", function() {
 	});
 });
 
+test("show() resolves correct default display #8099", function() {
+	expect(3);
+	var bug8099 = jQuery("<tt/>").appendTo("#main");
+
+	equals( bug8099.css("display"), "none", "default display override for all tt" );
+	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	bug8099.remove();
+
+	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+});
+
+
 test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();

From 885b64d4e683bce475a4ec8495cbba80b6b2e1b3 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Tue, 12 Apr 2011 13:47:27 -0400
Subject: [PATCH 02/11] Fixes #8099 using iframe to capture an element's real
 default display; suggested by lrbabe/louisremi

---
 src/effects.js | 54 +++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/effects.js b/src/effects.js
index 73ce33a8..e7987d21 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -548,45 +548,49 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
-	var stylesheets = document.styleSheets,
-			disabled = [],
-			elem, display, style, idx;
+	var iframe, iframeDoc, iframeNode, display;
 
 	if ( !elemdisplay[ nodeName ] ) {
 
-		// #8099 - If the end-dev has globally changed a default
-		// display, we can temporarily disable their styles to check
-		// for the correct default value
-		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
-			style = stylesheets[ idx ];
-			disabled[ idx ] = style.disabled;
-			style.disabled = true;
+		iframe = defaultDisplay.iframe.clone()[ 0 ];
+
+		iframe.style.display = "none";
+
+		document.body.appendChild( iframe );
+
+		iframeDoc = iframe.contentWindow && iframe.contentWindow || 
+								iframe.contentDocument.document && iframe.contentDocument.document ||
+								iframe.contentDocument;
+
+		iframeNode = jQuery( "<" + nodeName + ">" ).appendTo( jQuery( "body", iframeDoc.document ) );
+
+		if ( !iframeNode.length ) {
+			// this will only occur in IE
+			iframeDoc.document.open();
+			iframeDoc.document.write("<!doctype html><html><body></body></html>");
+			elem = iframeDoc.document.createElement( nodeName );
+			iframeDoc.document.body.appendChild( elem );
+			iframeDoc.document.close();
+
+			iframeNode = jQuery( elem );
 		}
-		
-		// To accurately check an element's default display value, 
-		// create a temp element and check it's default display, this
-		// will ensure that the value returned is not a user-tampered
-		// value.
-		elem = jQuery("<" + nodeName + ">").appendTo("body"),
-		display = elem.css("display");
-		
-		// Remove temp element
-		elem.remove();
+
+		// firefox returns undefined from css("display")
+		display = iframeNode.css("display") || iframeNode[ 0 ].style.display;
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
 		}
-		
+
 		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
 
-		// Restore stylesheets
-		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
-			stylesheets[ idx ].disabled = disabled[ idx ];
-		}
+		iframe.parentNode.removeChild( iframe );
 	}
 
 	return elemdisplay[ nodeName ];
 }
 
+defaultDisplay.iframe = jQuery("<iframe/>");
+
 })( jQuery );

From 81de96af740f8d397585d8a6fc2a3765dfd16d49 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Tue, 12 Apr 2011 17:27:45 -0400
Subject: [PATCH 03/11] Fixes #8099 using iframe to capture an element's real
 default display; suggested by lrbabe/louisremi

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

diff --git a/src/effects.js b/src/effects.js
index e7987d21..bdd0715e 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -548,35 +548,24 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
-	var iframe, iframeDoc, iframeNode, display;
 
 	if ( !elemdisplay[ nodeName ] ) {
 
-		iframe = defaultDisplay.iframe.clone()[ 0 ];
+		var iframe, iframeDoc, iframeNode, display, elem;
 
-		iframe.style.display = "none";
+		iframe = defaultDisplay.iframe.clone()[ 0 ];
 
 		document.body.appendChild( iframe );
 
-		iframeDoc = iframe.contentWindow && iframe.contentWindow || 
-								iframe.contentDocument.document && iframe.contentDocument.document ||
-								iframe.contentDocument;
+		iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
 
-		iframeNode = jQuery( "<" + nodeName + ">" ).appendTo( jQuery( "body", iframeDoc.document ) );
+		iframeDoc.open();
+		iframeDoc.write("<!doctype><html><body></body></html>");
+		elem = iframeDoc.createElement( nodeName );
+		iframeDoc.body.appendChild( elem );
+		iframeDoc.close();
 
-		if ( !iframeNode.length ) {
-			// this will only occur in IE
-			iframeDoc.document.open();
-			iframeDoc.document.write("<!doctype html><html><body></body></html>");
-			elem = iframeDoc.document.createElement( nodeName );
-			iframeDoc.document.body.appendChild( elem );
-			iframeDoc.document.close();
-
-			iframeNode = jQuery( elem );
-		}
-
-		// firefox returns undefined from css("display")
-		display = iframeNode.css("display") || iframeNode[ 0 ].style.display;
+		display = jQuery( elem ).css( "display" );
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
@@ -591,6 +580,12 @@ function defaultDisplay( nodeName ) {
 	return elemdisplay[ nodeName ];
 }
 
-defaultDisplay.iframe = jQuery("<iframe/>");
+defaultDisplay.iframe = jQuery("<iframe/>", {
+	css: {
+		width: 0,
+		height: 0, 
+		border: 0
+	}
+});
 
 })( jQuery );

From 4fde550cb62219d7edd14653888608fbbf39c22a Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 13 Apr 2011 13:43:52 -0400
Subject: [PATCH 04/11] Ticket #8099 Conditional iframe approache, caches both
 iframe and iframedoc for reuse

---
 src/effects.js       | 63 +++++++++++++++++++++++++++-----------------
 test/unit/effects.js |  8 ++++--
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/src/effects.js b/src/effects.js
index bdd0715e..828798cb 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -551,41 +551,56 @@ function defaultDisplay( nodeName ) {
 
 	if ( !elemdisplay[ nodeName ] ) {
 
-		var iframe, iframeDoc, iframeNode, display, elem;
+		var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ),
+			display = elem.css( "display" );
 
-		iframe = defaultDisplay.iframe.clone()[ 0 ];
-
-		document.body.appendChild( iframe );
-
-		iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-
-		iframeDoc.open();
-		iframeDoc.write("<!doctype><html><body></body></html>");
-		elem = iframeDoc.createElement( nodeName );
-		iframeDoc.body.appendChild( elem );
-		iframeDoc.close();
-
-		display = jQuery( elem ).css( "display" );
+		elem.remove();	
 
 		if ( display === "none" || display === "" ) {
-			display = "block";
+
+			var iframe = defaultDisplay.iframe,
+					iframeDoc = defaultDisplay.iframeDoc;
+
+			// No iframe to use yet, so create it
+			if ( !defaultDisplay.iframe ) {
+
+				iframe = document.createElement( "iframe" );
+				iframe.width = iframe.height = 0;
+
+				document.body.appendChild( iframe );
+
+				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+				iframeDoc.write("<!doctype><html><body></body></html>");
+
+				// Cache iframe element
+				defaultDisplay.iframe = iframe;
+				defaultDisplay.iframeDoc = iframeDoc;
+			} else {
+
+				// Reuse previous iframe
+				document.body.appendChild( iframe );
+
+			}
+
+			elem = iframeDoc.createElement( nodeName );
+
+			iframeDoc.body.appendChild( elem );
+
+			display = jQuery( elem ).css( "display" );
+
+			iframe.parentNode.removeChild( iframe );
 		}
 
 		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
-
-		iframe.parentNode.removeChild( iframe );
 	}
 
 	return elemdisplay[ nodeName ];
 }
 
-defaultDisplay.iframe = jQuery("<iframe/>", {
-	css: {
-		width: 0,
-		height: 0, 
-		border: 0
-	}
-});
+defaultDisplay.iframe = null;
+defaultDisplay.iframeDoc = null;
+
+
 
 })( jQuery );
diff --git a/test/unit/effects.js b/test/unit/effects.js
index b68b9b6b..f3ccd218 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -163,15 +163,19 @@ test("Persist correct display value", function() {
 });
 
 test("show() resolves correct default display #8099", function() {
-	expect(3);
+	expect(5);
 	var bug8099 = jQuery("<tt/>").appendTo("#main");
 
 	equals( bug8099.css("display"), "none", "default display override for all tt" );
 	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
+	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+
+	equals( bug8099.hide().css("display"), "none", "default display override for all tt" );
+	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
 	bug8099.remove();
 
-	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
 });
 
 

From 59240d31c0c277a60fdc187e0fc9884007971106 Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 13 Apr 2011 13:58:17 -0400
Subject: [PATCH 05/11] Ticket #8099 Updates per review

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

diff --git a/src/effects.js b/src/effects.js
index 828798cb..460811cd 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -1,6 +1,8 @@
 (function( jQuery ) {
 
 var elemdisplay = {},
+	iframe = null, 
+	iframeDoc = null,
 	rfxtypes = /^(?:toggle|show|hide)$/,
 	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
 	timerId,
@@ -558,11 +560,8 @@ function defaultDisplay( nodeName ) {
 
 		if ( display === "none" || display === "" ) {
 
-			var iframe = defaultDisplay.iframe,
-					iframeDoc = defaultDisplay.iframeDoc;
-
 			// No iframe to use yet, so create it
-			if ( !defaultDisplay.iframe ) {
+			if ( !iframe ) {
 
 				iframe = document.createElement( "iframe" );
 				iframe.width = iframe.height = 0;
@@ -572,9 +571,6 @@ function defaultDisplay( nodeName ) {
 				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
 				iframeDoc.write("<!doctype><html><body></body></html>");
 
-				// Cache iframe element
-				defaultDisplay.iframe = iframe;
-				defaultDisplay.iframeDoc = iframeDoc;
 			} else {
 
 				// Reuse previous iframe
@@ -598,9 +594,6 @@ function defaultDisplay( nodeName ) {
 	return elemdisplay[ nodeName ];
 }
 
-defaultDisplay.iframe = null;
-defaultDisplay.iframeDoc = null;
-
 
 
 })( jQuery );
diff --git a/test/unit/effects.js b/test/unit/effects.js
index f3ccd218..08212887 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -163,8 +163,9 @@ test("Persist correct display value", function() {
 });
 
 test("show() resolves correct default display #8099", function() {
-	expect(5);
-	var bug8099 = jQuery("<tt/>").appendTo("#main");
+	expect(7);
+	var bug8099 = jQuery("<tt/>").appendTo("#main"), 
+			div8099 = jQuery("<div/>", { className: "hidden" }).appendTo("#main");
 
 	equals( bug8099.css("display"), "none", "default display override for all tt" );
 	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
@@ -174,7 +175,11 @@ test("show() resolves correct default display #8099", function() {
 	equals( bug8099.hide().css("display"), "none", "default display override for all tt" );
 	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
+	equals( div8099.show().css("display"), "block", "default display override for all div.hidden" );
+	equals( div8099.hide().css("display"), "none", "Correctly resolves display:none" );
+
 	bug8099.remove();
+	div8099.remove();
 
 });
 

From a76decc47660591bb807aecf56825019da8b39fa Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 13 Apr 2011 15:43:15 -0400
Subject: [PATCH 06/11] Ticket #8099 Performance tweaking, credits

---
 src/effects.js          | 28 +++++++++++++++-------------
 test/data/testsuite.css |  2 ++
 test/unit/effects.js    | 20 ++++++++++----------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/effects.js b/src/effects.js
index 460811cd..a43d5cb3 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -556,35 +556,37 @@ function defaultDisplay( nodeName ) {
 		var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ),
 			display = elem.css( "display" );
 
-		elem.remove();	
+		elem.remove();
 
 		if ( display === "none" || display === "" ) {
 
+			// Get element's real default display by attaching it to a temp iframe
+			// Conritbutions from Louis Remi and Julian Aurbourg
+			// based on recommendation by Louis Remi
+			
 			// No iframe to use yet, so create it
 			if ( !iframe ) {
-
 				iframe = document.createElement( "iframe" );
-				iframe.width = iframe.height = 0;
+				iframe.frameBorder = iframe.width = iframe.height = 0;
+			}
 
-				document.body.appendChild( iframe );
+			document.body.appendChild( iframe );
 
+			// Create a cacheable copy of the iframe document on first call.
+			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake html
+			// document to it, Webkit & Firefox won't allow reusing the iframe document
+			if ( !iframeDoc || !iframe.createElement ) {
 				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-				iframeDoc.write("<!doctype><html><body></body></html>");
-
-			} else {
-
-				// Reuse previous iframe
-				document.body.appendChild( iframe );
-
+				iframeDoc.write( "<!doctype><html><body></body></html>" );
 			}
 
 			elem = iframeDoc.createElement( nodeName );
 
 			iframeDoc.body.appendChild( elem );
 
-			display = jQuery( elem ).css( "display" );
+			display = jQuery.css( elem, "display" );
 
-			iframe.parentNode.removeChild( iframe );
+			document.body.removeChild( iframe );
 		}
 
 		// Store the correct default display
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index b307d498..683803e8 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -112,3 +112,5 @@ div#show-tests * { display: none; }
 
 /* 8099 changes to default styles are read correctly */
 tt { display: none; }
+sup { display: none; }
+dfn { display: none; }
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 08212887..8b7cf467 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -164,22 +164,22 @@ test("Persist correct display value", function() {
 
 test("show() resolves correct default display #8099", function() {
 	expect(7);
-	var bug8099 = jQuery("<tt/>").appendTo("#main"), 
-			div8099 = jQuery("<div/>", { className: "hidden" }).appendTo("#main");
+	var tt8099 = jQuery("<tt/>").appendTo("body"), 
+			dfn8099 = jQuery("<dfn/>", { html: "foo"}).appendTo("body");
 
-	equals( bug8099.css("display"), "none", "default display override for all tt" );
-	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+	equals( tt8099.css("display"), "none", "default display override for all tt" );
+	equals( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
 	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
 
-	equals( bug8099.hide().css("display"), "none", "default display override for all tt" );
-	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+	equals( tt8099.hide().css("display"), "none", "default display override for all tt" );
+	equals( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
-	equals( div8099.show().css("display"), "block", "default display override for all div.hidden" );
-	equals( div8099.hide().css("display"), "none", "Correctly resolves display:none" );
+	equals( dfn8099.css("display"), "none", "default display override for all dfn" );
+	equals( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
-	bug8099.remove();
-	div8099.remove();
+	tt8099.remove();
+	dfn8099.remove();
 
 });
 

From e64d3d4e5793d84fe93894c90dc11a64810fae24 Mon Sep 17 00:00:00 2001
From: Jordan Boesch <jboesch26@gmail.com>
Date: Wed, 13 Apr 2011 22:30:30 -0600
Subject: [PATCH 07/11] fixing bug 4146 - round 2!

---
 src/css.js              | 46 +++++++++++++++---------
 test/unit/dimensions.js | 79 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 16 deletions(-)

diff --git a/src/css.js b/src/css.js
index c5c01eca..02bedf0b 100644
--- a/src/css.js
+++ b/src/css.js
@@ -338,25 +338,39 @@ curCSS = getComputedStyle || currentStyle;
 
 function getWH( elem, name, extra ) {
 	var which = name === "width" ? cssWidth : cssHeight,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-	if ( extra === "border" ) {
-		return val;
+		cur = curCSS(elem, name),
+		// We're addressing the way Firefox handles certain inputs and buttons, offsetWidth/height actually returns a normal width/height
+		ff = /input|button/i.test( elem.tagName.toLowerCase() ) && curCSS( elem, '-moz-box-sizing' ) === 'border-box'; 
+	
+	// IE will return auto if we try to grab a width/height that is not set
+	if( ff || cur === 'auto') {
+		cur = name === "width" ? elem.offsetWidth : elem.offsetHeight;
 	}
+	
+	// Fixes an IE7 effects test. "Chain show hide" was returning "scroll" instead of "visible"
+	if( name == "height" ){
+		elem.offsetHeight;
+	}
+	
+	var val = parseFloat(cur) || 0;
 
-	jQuery.each( which, function() {
-		if ( !extra ) {
-			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
+	if ( extra ) {
+		for( var i = 0, len = which.length; i < len ; i++ ) {
+			var dir = which[i];
+			// outerWidth/height
+			if ( extra === "border" || extra === 'margin' ) {
+				val += parseFloat(jQuery.css( elem, "border" + dir + "Width" )) || 0;
+				val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
+				if( extra == 'margin' ) {
+					val += parseFloat(jQuery.css( elem, "margin" + dir )) || 0;
+				}
+			} 
+			// innerWidth/height
+			else {
+				val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
+			}
 		}
-
-		if ( extra === "margin" ) {
-			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
-
-		} else {
-			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
-		}
-	});
-
+	}
 	return val;
 }
 
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 641165f4..7019a288 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -222,3 +222,82 @@ test("outerHeight()", function() {
 	div.remove();
 	jQuery.removeData($div[0], "olddisplay", true);
 });
+
+test('width(), outerWidth(), innerWidth(), height(), outerHeight() and innerHeight() with inputs', function(){
+	expect(47);
+
+	var id = 'input-width-test-group';
+	var input_els = 'submit reset button'.split(' ');
+	var html = '<div id="' + id + '" style="width:100px;">';
+	var style = 'width:35px;height:50px;padding:5px;border:1px solid #000;margin:2px;';
+
+	html += '<div id="nothing-set-div">test</div>';
+	html += '<div id="width-div-1" style="' + style + '">something</div>';
+	html += '<button id="width-button-1" style="' + style + '">button</button>';
+	jQuery.each(input_els, function() {
+		html += '<input class="width-input" type="' + this + '" style="' + style + '" />';
+	});
+	html += '</div>';
+
+	jQuery('#main').append(html);
+
+	equals(jQuery('#nothing-set-div').width(), 100, 'Width of unset div takes on parent');
+
+	jQuery('#width-div-1, #width-button-1, .width-input').each(function(){
+
+		// Test widths
+		var w = jQuery(this).width();
+		var outer_w = jQuery(this).outerWidth();
+		var outer_w_margin = jQuery(this).outerWidth(true);
+		var inner_w = jQuery(this).innerWidth();
+		var t = this.tagName.toLowerCase() + ((this.type) ? '[' + this.type + ']' : '');
+
+		equals(w, 35, 'Make sure width() works for ' + t);
+		equals(outer_w, 47, 'Make sure outerWidth() works for ' + t);
+		equals(outer_w_margin, 51, 'Make sure outerWidth(true) works for ' + t);
+		equals(inner_w, 45, 'Make sure innerWidth() works for ' + t);
+
+		// Test heights
+		var h = jQuery(this).height();
+		var outer_h = jQuery(this).outerHeight();
+		var outer_h_margin = jQuery(this).outerHeight(true);
+		var inner_h = jQuery(this).innerHeight();
+
+		equals(h, 50, 'Make sure height() works for ' + t);
+		equals(outer_h, 62, 'Make sure outerHeight() works for ' + t);
+		equals(outer_h_margin, 66, 'Make sure outerHeight(true) works for ' + t);
+		equals(inner_h, 60, 'Make sure innerHeight() works for ' + t);
+
+	});
+
+	var inputsub = jQuery('.width-input').filter('input[type=submit]');
+
+	inputsub.css({
+		width: 10,
+		padding: 0,
+		margin: '3px',
+		border: '1px solid red',
+		height: 15
+	});
+	
+	var w = inputsub.width();
+	equals(w, 10, 'width() works after setting css using .css()');
+
+	var outer_w = inputsub.outerWidth();
+	equals(outer_w, 12, 'outerWidth() works after setting css using .css()');
+
+	var outer_w_margin = inputsub.outerWidth(true);
+	equals(outer_w_margin, 18, 'outerWidth(true) works after setting css using .css()');
+	
+	var h = inputsub.height();
+	equals(h, 15, 'height() works after setting css using .css()');
+	
+	var outer_h = inputsub.outerHeight();
+	equals(outer_h, 17, 'outerHeight() works after setting css using .css()');
+
+	var outer_h_margin = inputsub.outerHeight(true);
+	equals(outer_h_margin, 23, 'outerHeight(true) works after setting css using .css()');
+	
+	jQuery('#' + id).remove();
+
+});

From 84712bd624a9a4eeaab9ea9c543bba494f2cc3e1 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 14 Apr 2011 15:49:15 -0400
Subject: [PATCH 08/11] Fix formatting of pull 325. Fixes #4146.

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

diff --git a/src/css.js b/src/css.js
index 02bedf0b..385c21a0 100644
--- a/src/css.js
+++ b/src/css.js
@@ -9,6 +9,7 @@ var ralpha = /alpha\([^)]*\)/i,
 	rnum = /^-?\d/,
 	rrelNum = /^[+\-]=/,
 	rrelNumFilter = /[^+\-\.\de]+/g,
+	rinputbutton = /input|button/i,
 
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssWidth = [ "Left", "Right" ],
@@ -338,39 +339,45 @@ curCSS = getComputedStyle || currentStyle;
 
 function getWH( elem, name, extra ) {
 	var which = name === "width" ? cssWidth : cssHeight,
-		cur = curCSS(elem, name),
-		// We're addressing the way Firefox handles certain inputs and buttons, offsetWidth/height actually returns a normal width/height
-		ff = /input|button/i.test( elem.tagName.toLowerCase() ) && curCSS( elem, '-moz-box-sizing' ) === 'border-box'; 
+		cur = curCSS( elem, name ),
+
+		// We're addressing the way Firefox handles certain inputs and buttons,
+		// offsetWidth/height actually returns a normal width/height
+		boxSizing = rinputbutton.test( elem.nodeName ) &&
+			curCSS( elem, "-moz-box-sizing" ) === "border-box"; 
 	
 	// IE will return auto if we try to grab a width/height that is not set
-	if( ff || cur === 'auto') {
+	if ( boxSizing || cur === "auto" ) {
 		cur = name === "width" ? elem.offsetWidth : elem.offsetHeight;
 	}
-	
-	// Fixes an IE7 effects test. "Chain show hide" was returning "scroll" instead of "visible"
-	if( name == "height" ){
+
+	// Make sure that IE7 returns the correct computed value for display
+	if ( name === "height" ) {
 		elem.offsetHeight;
 	}
 	
-	var val = parseFloat(cur) || 0;
+	var val = parseFloat( cur ) || 0;
 
 	if ( extra ) {
-		for( var i = 0, len = which.length; i < len ; i++ ) {
+		for ( var i = 0, len = which.length; i < len ; i++ ) {
 			var dir = which[i];
+
 			// outerWidth/height
-			if ( extra === "border" || extra === 'margin' ) {
+			if ( extra === "border" || extra === "margin" ) {
 				val += parseFloat(jQuery.css( elem, "border" + dir + "Width" )) || 0;
 				val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
-				if( extra == 'margin' ) {
+
+				if ( extra == "margin" ) {
 					val += parseFloat(jQuery.css( elem, "margin" + dir )) || 0;
 				}
-			} 
+
 			// innerWidth/height
-			else {
+			} else {
 				val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
 			}
 		}
 	}
+
 	return val;
 }
 

From d4b31a15ff7bd0ffb6576229d34a98ce1c9c4085 Mon Sep 17 00:00:00 2001
From: timmywil <tim.willison@thisismedium.com>
Date: Thu, 14 Apr 2011 16:26:20 -0400
Subject: [PATCH 09/11] Adds box-sizing check for IE9 inputs and buttons

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

diff --git a/src/css.js b/src/css.js
index 385c21a0..9db65996 100644
--- a/src/css.js
+++ b/src/css.js
@@ -344,7 +344,8 @@ function getWH( elem, name, extra ) {
 		// We're addressing the way Firefox handles certain inputs and buttons,
 		// offsetWidth/height actually returns a normal width/height
 		boxSizing = rinputbutton.test( elem.nodeName ) &&
-			curCSS( elem, "-moz-box-sizing" ) === "border-box"; 
+			( curCSS( elem, "-moz-box-sizing" ) === "border-box" ||
+			curCSS( elem, "box-sizing" ) === "border-box" );
 	
 	// IE will return auto if we try to grab a width/height that is not set
 	if ( boxSizing || cur === "auto" ) {

From 19ceebd0f4817ddb2b6593d172e36e96d384aabb Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 14 Apr 2011 16:29:14 -0400
Subject: [PATCH 10/11] Tagging the 1.6b1 release.

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

diff --git a/version.txt b/version.txt
index 0a0196e2..9f498176 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.6pre
\ No newline at end of file
+1.6b1
\ No newline at end of file

From 8e1467f97eb8facb6677663794eb159eb8fedaab Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Thu, 14 Apr 2011 16:29:22 -0400
Subject: [PATCH 11/11] 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 9f498176..0a0196e2 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.6b1
\ No newline at end of file
+1.6pre
\ No newline at end of file