deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed getting styles from disconnected nodes. Fixes #7148.

Browse source
This commit is contained in:
Scott González 2010-10-11 15:11:03 -04:00
parent 2866f16c09
commit 22ccbf82c8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/css.js
View file

@ -230,6 +230,9 @@ if ( getComputedStyle ) {
if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
ret = computedStyle.getPropertyValue( name ); ret = computedStyle.getPropertyValue( name );
if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
ret = jQuery.style( elem, name );
}
} }
return ret; return ret;

4
test/unit/css.js
View file

@ -1,7 +1,7 @@
module("css"); module("css");
test("css(String|Hash)", function() { test("css(String|Hash)", function() {
expect(33); expect(34);
equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"'); 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('width')), width, 'Test negative width ignored')
equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height 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'}); jQuery('#floatTest').css({'float': 'right'});
equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
jQuery('#floatTest').css({'font-size': '30px'}); jQuery('#floatTest').css({'font-size': '30px'});