library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dimensions: Improve offsetWidth/offsetHeight fallback

Browse Source 
Fixes gh-3698
Fixes gh-3602
Closes gh-3738
This commit is contained in:
Richard Gibson 2017-07-31 12:36:54 -04:00 committed by GitHub
parent 262acc6f1e
commit a49578499e
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/css.js
View File

@ -163,10 +163,17 @@ function getWidthOrHeight( elem, dimension, extra ) {
valueIsBorderBox = valueIsBorderBox && valueIsBorderBox = valueIsBorderBox &&
( support.boxSizingReliable() || val === elem.style[ dimension ] ); ( support.boxSizingReliable() || val === elem.style[ dimension ] );
// Fall back to offsetWidth/Height when value is "auto" // Fall back to offsetWidth/offsetHeight when value is "auto"
// This happens for inline elements with no explicit setting (gh-3571) // This happens for inline elements with no explicit setting (gh-3571)
if ( val === "auto" ) { // Support: Android <=4.1 - 4.3 only
// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
if ( val === "auto" ||
!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) {
val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ]; val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ];
// offsetWidth/offsetHeight provide border-box values
valueIsBorderBox = true;
} }
// Normalize "" and auto // Normalize "" and auto

19
test/unit/dimensions.js
View File

@ -544,6 +544,25 @@ QUnit.test( "width/height on an inline element with no explicitly-set dimensions
} ); } );
} ); } );
QUnit.test( "width/height on a table row with phantom borders (gh-3698)", function( assert ) {
assert.expect( 4 );
jQuery( "<table id='gh3698' style='border-collapse: separate; border-spacing: 0;'><tbody>" +
"<tr style='margin: 0; border: 10px solid black; padding: 0'>" +
"<td style='margin: 0; border: 0; padding: 0; height: 42px; width: 42px;'></td>" +
"</tr>" +
"</tbody></table>" ).appendTo( "#qunit-fixture" );
var $elem = jQuery( "#gh3698 tr" );
jQuery.each( [ "Width", "Height" ], function( i, method ) {
assert.equal( $elem[ "outer" + method ](), 42,
"outer" + method + " should match content dimensions" );
assert.equal( $elem[ "outer" + method ]( true ), 42,
"outer" + method + "(true) should match content dimensions" );
} );
} );
QUnit.test( "interaction with scrollbars (gh-3589)", function( assert ) { QUnit.test( "interaction with scrollbars (gh-3589)", function( assert ) {
assert.expect( 48 ); assert.expect( 48 );