github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-01-24 11:48:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't swap to measure dimensions unless the element is display:none. #807 Fixes #11293

Browse Source
This commit is contained in:
Mike Sherov
2012-06-07 11:08:31 -04:00
committed by Rick Waldron
parent 79af1b457b
commit c80bc22728
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/css.js
View File

@@ -480,7 +480,7 @@ jQuery.each([ "height", "width" ], function( i, name ) {
jQuery.cssHooks[ name ] = {
get: function( elem, computed, extra ) {
if ( computed ) {
if ( elem.offsetWidth !== 0 ) {
if ( elem.offsetWidth !== 0 || curCSS( elem, "display" ) !== "none" ) {
return getWidthOrHeight( elem, name, extra );
} else {
return jQuery.swap( elem, cssShow, function() {

10
test/unit/dimensions.js
View File

@@ -299,6 +299,16 @@ test("outerWidth(true) returning % instead of px in Webkit, see #10639", functio
equal( el.outerWidth(true), 400, "outerWidth(true) and css('margin') returning % instead of px in Webkit, see #10639" );
});
test( "getting dimensions of zero width/height table elements shouldn't alter dimensions", function() {
expect( 1 );
var table = jQuery("<table><tbody><tr><td></td><td>a</td></tr><tr><td></td><td>a</td></tr></tbody></table>").appendTo("#qunit-fixture"),
elem = table.find("tr:eq(0) td:eq(0)");
table.find("td").css({ margin: 0, padding: 0 });
equal( elem.width(), elem.width(), "width() doesn't alter dimension values" );
});
test("box-sizing:border-box child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height() see #10413", function() {
expect(16);