Skip to content

J
jquery
Commit c078b83b authored by Mike Sherov's avatar Mike Sherov Committed by Dave Methvin
Browse files
Options

Fix #12313, .height()/.width() just use CSS if no offsetWidth. Close gh-909.

parent 9a92c542
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
src/css.js
View file @ c078b83b
...@@ -411,7 +411,10 @@ function getWidthOrHeight( elem, name, extra ) { ...@@ -411,7 +411,10 @@ function getWidthOrHeight( elem, name, extra ) {
valueIsBorderBox = true, valueIsBorderBox = true,
isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"; isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
if ( val <= 0 ) { // some non-html elements return undefined for offsetWidth, so check for null/undefined
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
if ( val <= 0 || val == null ) {
// Fall back to computed then uncomputed css if necessary // Fall back to computed then uncomputed css if necessary
val = curCSS( elem, name ); val = curCSS( elem, name );
if ( val < 0 || val == null ) { if ( val < 0 || val == null ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment