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

Make sure that height/width getters work on hidden inputs and disconnected elements. Fixes #7225.

Browse source
This commit is contained in:
jeresig 2010-10-22 00:28:33 -04:00
parent 3df41db036
commit e4a38670b1
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/css.js
View file

@ -169,6 +169,10 @@ jQuery.each(["height", "width"], function( i, name ) {
}); });
} }
if ( val < 0 || val === 0 && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
return elem.style[ name ] || "0px";
}
return val + "px"; return val + "px";
} }
}, },

20
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(34); expect(42);
equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"'); equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
@ -11,6 +11,24 @@ test("css(String|Hash)", function() {
jQuery('#nothiddendiv').css({display: 'block'}); jQuery('#nothiddendiv').css({display: 'block'});
ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible'); ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
var div = jQuery( "<div>" );
equals( div.css("width"), "0px", "Width on disconnected node." );
equals( div.css("height"), "0px", "Height on disconnected node." );
div.css({ width: 4, height: 4 });
equals( div.css("width"), "4px", "Width on disconnected node." );
equals( div.css("height"), "4px", "Height on disconnected node." );
var div2 = jQuery( "<div style='display:none;'><input type='text'/><textarea/></div>").appendTo("body");
equals( div2.find("input").css("width"), "0px", "Width on hidden input." );
equals( div2.find("input").css("height"), "0px", "Height on hidden input." );
equals( div2.find("textarea").css("width"), "0px", "Width on hidden textarea." );
equals( div2.find("textarea").css("height"), "0px", "Height on hidden textarea." );
// handle negative numbers by ignoring #1599, #4216 // handle negative numbers by ignoring #1599, #4216
jQuery('#nothiddendiv').css({ 'width': 1, 'height': 1 }); jQuery('#nothiddendiv').css({ 'width': 1, 'height': 1 });