From: John Resig <jeresig@gmail.com>
Date: Mon, 11 Oct 2010 20:40:10 +0000 (-0400)
Subject: Merge branch 'bug7141' of http://github.com/csnover/jquery into csnover-bug7141
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=5f30ae3b6fa89c3cc00c8c67305c84f21f76aa68;hp=5646a4feee87b086fa4752373422622d54a8430d;p=jquery.git

Merge branch 'bug7141' of github.com/csnover/jquery into csnover-bug7141
---

diff --git a/src/css.js b/src/css.js
index d0e55db..933d2b4 100644
--- a/src/css.js
+++ b/src/css.js
@@ -230,6 +230,9 @@ if ( getComputedStyle ) {
 
 		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
 			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
 		}
 
 		return ret;
diff --git a/test/unit/css.js b/test/unit/css.js
index 8a49096..632464b 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(33);
+	expect(34);
 
 	equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
 
@@ -19,6 +19,8 @@ test("css(String|Hash)", function() {
 	equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored')
 	equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored')
 
+	equals( jQuery('<div style="display: none;">').css('display'), 'none', 'Styles on disconnected nodes');
+
 	jQuery('#floatTest').css({'float': 'right'});
 	equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
 	jQuery('#floatTest').css({'font-size': '30px'});