mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
CSS: Workaround buggy getComputedStyle on table rows in IE/Edge
Fixes gh-4490 Closes gh-4506
This commit is contained in:
parent
ed66d5a22b
commit
26415e081b
27
src/css.js
27
src/css.js
@ -1,6 +1,7 @@
|
|||||||
define( [
|
define( [
|
||||||
"./core",
|
"./core",
|
||||||
"./core/access",
|
"./core/access",
|
||||||
|
"./core/nodeName",
|
||||||
"./var/rcssNum",
|
"./var/rcssNum",
|
||||||
"./var/isIE",
|
"./var/isIE",
|
||||||
"./css/var/rnumnonpx",
|
"./css/var/rnumnonpx",
|
||||||
@ -11,13 +12,14 @@ define( [
|
|||||||
"./css/var/swap",
|
"./css/var/swap",
|
||||||
"./css/curCSS",
|
"./css/curCSS",
|
||||||
"./css/adjustCSS",
|
"./css/adjustCSS",
|
||||||
|
"./css/support",
|
||||||
"./css/finalPropName",
|
"./css/finalPropName",
|
||||||
|
|
||||||
"./core/init",
|
"./core/init",
|
||||||
"./core/ready",
|
"./core/ready",
|
||||||
"./selector" // contains
|
"./selector" // contains
|
||||||
], function( jQuery, access, rcssNum, isIE, rnumnonpx, cssExpand, isAutoPx,
|
], function( jQuery, access, nodeName, rcssNum, isIE, rnumnonpx, cssExpand, isAutoPx,
|
||||||
cssCamelCase, getStyles, swap, curCSS, adjustCSS, finalPropName ) {
|
cssCamelCase, getStyles, swap, curCSS, adjustCSS, support, finalPropName ) {
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
@ -138,14 +140,21 @@ function getWidthOrHeight( elem, dimension, extra ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Fall back to offsetWidth/offsetHeight when value is "auto"
|
|
||||||
// This happens for inline elements with no explicit setting (gh-3571)
|
|
||||||
//
|
|
||||||
// Support: IE 9 - 11+
|
// Support: IE 9 - 11+
|
||||||
// Also use offsetWidth/offsetHeight for when box sizing is unreliable
|
// Use offsetWidth/offsetHeight for when box sizing is unreliable.
|
||||||
// We use getClientRects() to check for hidden/disconnected.
|
// In those cases, the computed value can be trusted to be border-box.
|
||||||
// In those cases, the computed value can be trusted to be border-box
|
if ( ( isIE && isBorderBox ||
|
||||||
if ( ( isIE && isBorderBox || val === "auto" ) &&
|
|
||||||
|
// Support: IE 10 - 11+, Edge 15 - 18+
|
||||||
|
// IE/Edge misreport `getComputedStyle` of table rows with width/height
|
||||||
|
// set in CSS while `offset*` properties report correct values.
|
||||||
|
!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
|
||||||
|
|
||||||
|
// Fall back to offsetWidth/offsetHeight when value is "auto"
|
||||||
|
// This happens for inline elements with no explicit setting (gh-3571)
|
||||||
|
val === "auto" ) &&
|
||||||
|
|
||||||
|
// Make sure the element is visible & connected
|
||||||
elem.getClientRects().length ) {
|
elem.getClientRects().length ) {
|
||||||
|
|
||||||
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
|
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
|
||||||
|
40
src/css/support.js
Normal file
40
src/css/support.js
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
define( [
|
||||||
|
"../var/document",
|
||||||
|
"../var/documentElement",
|
||||||
|
"../var/support"
|
||||||
|
], function( document, documentElement, support ) {
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var reliableTrDimensionsVal;
|
||||||
|
|
||||||
|
// Support: IE 11+, Edge 15 - 18+
|
||||||
|
// IE/Edge misreport `getComputedStyle` of table rows with width/height
|
||||||
|
// set in CSS while `offset*` properties report correct values.
|
||||||
|
support.reliableTrDimensions = function() {
|
||||||
|
var table, tr, trChild;
|
||||||
|
if ( reliableTrDimensionsVal == null ) {
|
||||||
|
table = document.createElement( "table" );
|
||||||
|
tr = document.createElement( "tr" );
|
||||||
|
trChild = document.createElement( "div" );
|
||||||
|
|
||||||
|
table.style.cssText = "position:absolute;left:-11111px";
|
||||||
|
tr.style.height = "1px";
|
||||||
|
trChild.style.height = "9px";
|
||||||
|
|
||||||
|
documentElement
|
||||||
|
.appendChild( table )
|
||||||
|
.appendChild( tr )
|
||||||
|
.appendChild( trChild );
|
||||||
|
|
||||||
|
var trStyle = window.getComputedStyle( tr );
|
||||||
|
reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
|
||||||
|
|
||||||
|
documentElement.removeChild( table );
|
||||||
|
}
|
||||||
|
return reliableTrDimensionsVal;
|
||||||
|
};
|
||||||
|
|
||||||
|
return support;
|
||||||
|
|
||||||
|
} );
|
@ -1352,6 +1352,26 @@ QUnit.test( "css('width') and css('height') should respect box-sizing, see #1100
|
|||||||
assert.equal( el_dis.css( "height" ), el_dis.css( "height", el_dis.css( "height" ) ).css( "height" ), "css('height') is not respecting box-sizing for disconnected element, see #11004" );
|
assert.equal( el_dis.css( "height" ), el_dis.css( "height", el_dis.css( "height" ) ).css( "height" ), "css('height') is not respecting box-sizing for disconnected element, see #11004" );
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
QUnit.test( "table rows width/height should be unaffected by inline styles", function( assert ) {
|
||||||
|
assert.expect( 2 );
|
||||||
|
|
||||||
|
var table = jQuery(
|
||||||
|
"<table>\n" +
|
||||||
|
" <tr id=\"row\" style=\"height: 1px; width: 1px;\">\n" +
|
||||||
|
" <td>\n" +
|
||||||
|
" <div style=\"height: 100px; width: 100px;\"></div>\n" +
|
||||||
|
" </div>\n" +
|
||||||
|
" </tr>\n" +
|
||||||
|
"</table>"
|
||||||
|
);
|
||||||
|
var tr = table.find( "tr" );
|
||||||
|
|
||||||
|
table.appendTo( "#qunit-fixture" );
|
||||||
|
|
||||||
|
assert.ok( parseInt( tr.css( "width" ) ) > 10, "tr width unaffected by inline style" );
|
||||||
|
assert.ok( parseInt( tr.css( "height" ) ) > 10, "tr height unaffected by inline style" );
|
||||||
|
} );
|
||||||
|
|
||||||
testIframe(
|
testIframe(
|
||||||
"css('width') should work correctly before document ready (#14084)",
|
"css('width') should work correctly before document ready (#14084)",
|
||||||
"css/cssWidthBeforeDocReady.html",
|
"css/cssWidthBeforeDocReady.html",
|
||||||
|
@ -59,21 +59,27 @@ testIframe(
|
|||||||
userAgent = window.navigator.userAgent,
|
userAgent = window.navigator.userAgent,
|
||||||
expectedMap = {
|
expectedMap = {
|
||||||
edge: {
|
edge: {
|
||||||
|
reliableTrDimensions: false,
|
||||||
scope: undefined
|
scope: undefined
|
||||||
},
|
},
|
||||||
ie_11: {
|
ie_11: {
|
||||||
|
reliableTrDimensions: false,
|
||||||
scope: undefined
|
scope: undefined
|
||||||
},
|
},
|
||||||
chrome: {
|
chrome: {
|
||||||
|
reliableTrDimensions: true,
|
||||||
scope: true
|
scope: true
|
||||||
},
|
},
|
||||||
safari: {
|
safari: {
|
||||||
|
reliableTrDimensions: true,
|
||||||
scope: true
|
scope: true
|
||||||
},
|
},
|
||||||
firefox: {
|
firefox: {
|
||||||
|
reliableTrDimensions: true,
|
||||||
scope: true
|
scope: true
|
||||||
},
|
},
|
||||||
ios: {
|
ios: {
|
||||||
|
reliableTrDimensions: true,
|
||||||
scope: true
|
scope: true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user