Fixed getting styles from disconnected nodes. Fixes #7148.
This commit is contained in:
parent
2866f16c09
commit
22ccbf82c8
|
@ -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;
|
||||
|
|
|
@ -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'});
|
||||
|
|
Loading…
Reference in a new issue