From 90c50ef961ac3862e6ef693f588f513bf5e759ee Mon Sep 17 00:00:00 2001 From: Christian Kosmowski Date: Mon, 14 Apr 2014 16:00:42 +0200 Subject: [PATCH] Dimensions: Reverse a check to avoid potential reflows Fixes #14979 Closes gh-1560 (cherry picked from commit 1ca84214cc89d9e5f8af12b18b34426fc91b1b08) Conflicts: AUTHORS.txt --- AUTHORS.txt | 1 + src/css.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 0856478f2..18756d281 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -211,4 +211,5 @@ Roman Reiß Benjy Cui Rodrigo Rosenfeld Rosas John Hoven +Christian Kosmowski diff --git a/src/css.js b/src/css.js index 31f551eb1..2c88f2bc3 100644 --- a/src/css.js +++ b/src/css.js @@ -350,7 +350,7 @@ jQuery.each([ "height", "width" ], function( i, name ) { if ( computed ) { // certain elements can have dimension info if we invisibly show them // however, it must have a current display style that would benefit from this - return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ? + return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ? jQuery.swap( elem, cssShow, function() { return getWidthOrHeight( elem, name, extra ); }) : -- 2.39.5