Permalink
Browse files

Dimensions: Don't trust non-pixel computed width/height

Fixes gh-3611
Closes gh-3741
  • Loading branch information...
gibson042 committed Aug 7, 2017
1 parent f3c5776 commit 3cf1d14ccc63b8054ee977e90c72c5da07c80e59
Showing with 29 additions and 2 deletions.
  1. +6 −2 src/css.js
  2. +23 −0 test/unit/dimensions.js
@@ -153,9 +153,13 @@ function getWidthOrHeight( elem, dimension, extra ) {
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
valueIsBorderBox = isBorderBox;

// Computed unit is not pixels. Stop here and return.
// Support: Firefox <=54
// Return a confounding non-pixel value or feign ignorance, as appropriate.
if ( rnumnonpx.test( val ) ) {
return val;
if ( !extra ) {
return val;
}
val = "auto";
}

// Check for style in case a browser which returns unreliable values
@@ -544,6 +544,29 @@ QUnit.test( "width/height on an inline element with no explicitly-set dimensions
} );
} );

QUnit.test( "width/height on an inline element with percentage dimensions (gh-3611)",
function( assert ) {
assert.expect( 4 );

jQuery( "<div id='gh3611' style='width: 100px;'>" +
"<span style='width: 100%; padding: 0 5px'>text</span>" +
"</div>" ).appendTo( "#qunit-fixture" );

var $elem = jQuery( "#gh3611 span" ),
actualWidth = $elem[ 0 ].getBoundingClientRect().width,
marginWidth = $elem.outerWidth( true ),
borderWidth = $elem.outerWidth(),
paddingWidth = $elem.innerWidth(),
contentWidth = $elem.width();

assert.equal( Math.round( borderWidth ), Math.round( actualWidth ),
".outerWidth(): " + borderWidth + " approximates " + actualWidth );
assert.equal( marginWidth, borderWidth, ".outerWidth(true) matches .outerWidth()" );
assert.equal( paddingWidth, borderWidth, ".innerWidth() matches .outerWidth()" );
assert.equal( contentWidth, borderWidth - 10, ".width() excludes padding" );
}
);

QUnit.test( "width/height on a table row with phantom borders (gh-3698)", function( assert ) {
assert.expect( 4 );

0 comments on commit 3cf1d14

Please sign in to comment.