CSS: Make .css("width") & .css("height") return fractional values

Fixes gh-1724
Closes gh-2439

diff --git a/src/css.js b/src/css.js
index 373fdcb7e470894f216f666d6d38017e3295a313..859985f9d1d9bd06370d9581f7934fa3b8ee0108 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -108,21 +108,23 @@ function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
 function getWidthOrHeight( elem, name, extra ) {
 
        // Start with offset property, which is equivalent to the border-box value
-       var valueIsBorderBox = true,
-               val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+       var val,
+               valueIsBorderBox = true,
                styles = getStyles( elem ),
                isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
 
+       // Support: IE <= 11 only
+       // Running getBoundingClientRect on a disconnected node
+       // in IE throws an error.
+       if ( elem.getClientRects().length ) {
+               val = elem.getBoundingClientRect()[ name ];
+       }
+
        // Support: IE11 only
        // In IE 11 fullscreen elements inside of an iframe have
        // 100x too small dimensions (gh-1764).
        if ( document.msFullscreenElement && window.top !== window ) {
-               // Support: IE11 only
-               // Running getBoundingClientRect on a disconnected node
-               // in IE throws an error.
-               if ( elem.getClientRects().length ) {
-                       val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-               }
+               val *= 100;
        }
 
        // Some non-html elements return undefined for offsetWidth, so check for null/undefined
@@ -309,7 +311,13 @@ jQuery.each([ "height", "width" ], function( i, name ) {
                                // Certain elements can have dimension info if we invisibly show them
                                // but it must have a current display style that would benefit
                                return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-                                       elem.offsetWidth === 0 ?
+                                       // Support: Safari 8+
+                                       // Table columns in Safari have non-zero offsetWidth & zero
+                                       // getBoundingClientRect().width unless display is changed.
+                                       // Support: IE <= 11 only
+                                       // Running getBoundingClientRect on a disconnected node
+                                       // in IE throws an error.
+                                       ( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
                                                swap( elem, cssShow, function() {
                                                        return getWidthOrHeight( elem, name, extra );
                                                }) :

diff --git a/test/unit/css.js b/test/unit/css.js
index 22a3c7636585b63a12d8e09124014a8c467c91a8..06de4acd9f64f597dc66e603f8a0aa7ce978ab97 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -846,6 +846,51 @@ testIframeWithCallback( "css('width') should work correctly before document read
        }
 );
 
+( function() {
+       var supportsFractionalGBCR,
+               qunitFixture = document.getElementById( "qunit-fixture" ),
+               div = document.createElement( "div" );
+       div.style.width = "3.3px";
+       qunitFixture.appendChild( div );
+       supportsFractionalGBCR = div.getBoundingClientRect().width.toFixed(1) === "3.3";
+       qunitFixture.removeChild( div );
+
+       test( "css('width') and css('height') should return fractional values for nodes in the document", function() {
+               if ( !supportsFractionalGBCR ) {
+                       expect( 1 );
+                       ok( true, "This browser doesn't support fractional values in getBoundingClientRect()" );
+                       return;
+               }
+
+               expect( 2 );
+
+               var el = jQuery( "<div class='test-div'></div>" ).appendTo( "#qunit-fixture" );
+               jQuery( "<style>.test-div { width: 33.3px; height: 88.8px; }</style>" ).appendTo( "#qunit-fixture" );
+
+               equal( Number( el.css( "width" ).replace( /px$/, "" ) ).toFixed( 1 ), "33.3",
+                       "css('width') should return fractional values" );
+               equal( Number( el.css( "height" ).replace( /px$/, "" ) ).toFixed( 1 ), "88.8",
+                       "css('height') should return fractional values" );
+       } );
+
+       test( "css('width') and css('height') should return fractional values for disconnected nodes", function() {
+               if ( !supportsFractionalGBCR ) {
+                       expect( 1 );
+                       ok( true, "This browser doesn't support fractional values in getBoundingClientRect()" );
+                       return;
+               }
+
+               expect( 2 );
+
+               var el = jQuery( "<div style='width: 33.3px; height: 88.8px;'></div>" );
+
+               equal( Number( el.css( "width" ).replace( /px$/, "" ) ).toFixed( 1 ), "33.3",
+                       "css('width') should return fractional values" );
+               equal( Number( el.css( "height" ).replace( /px$/, "" ) ).toFixed( 1 ), "88.8",
+                       "css('height') should return fractional values" );
+       } );
+} )();
+
 test("certain css values of 'normal' should be convertable to a number, see #8627", function() {
        expect ( 3 );
 

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 7e31771617ea925ada1985c1ac4df5bd2c5d8d17..04810494a75980debed3d0a9becd540112d7bc8f 100644 (file)
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -258,10 +258,12 @@ test("child of a hidden elem (or unconnected node) has accurate inner/outer/Widt
        equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #9441" );
        equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #9300" );
 
-       equal( $divChild.height(), $divNormal.height(), "child of a hidden element height() is wrong see #9441" );
-       equal( $divChild.innerHeight(), $divNormal.innerHeight(), "child of a hidden element innerHeight() is wrong see #9441" );
-       equal( $divChild.outerHeight(), $divNormal.outerHeight(), "child of a hidden element outerHeight() is wrong see #9441" );
-       equal( $divChild.outerHeight(true), $divNormal.outerHeight( true ), "child of a hidden element outerHeight( true ) is wrong see #9300" );
+       // Support: IE 10-11, Edge
+       // Child height is not always decimal
+       equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #9441" );
+       equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #9441" );
+       equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #9441" );
+       equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #9300" );
 
        // tests that child div of an unconnected div works the same as a normal div
        equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #9441" );
@@ -269,10 +271,12 @@ test("child of a hidden elem (or unconnected node) has accurate inner/outer/Widt
        equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #9441" );
        equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #9300" );
 
-       equal( $divUnconnected.height(), $divNormal.height(), "unconnected element height() is wrong see #9441" );
-       equal( $divUnconnected.innerHeight(), $divNormal.innerHeight(), "unconnected element innerHeight() is wrong see #9441" );
-       equal( $divUnconnected.outerHeight(), $divNormal.outerHeight(), "unconnected element outerHeight() is wrong see #9441" );
-       equal( $divUnconnected.outerHeight(true), $divNormal.outerHeight( true ), "unconnected element outerHeight( true ) is wrong see #9300" );
+       // Support: IE 10-11, Edge
+       // Child height is not always decimal
+       equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #9441" );
+       equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #9441" );
+       equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #9441" );
+       equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #9300" );
 
        // teardown html
        $divHiddenParent.remove();
@@ -329,10 +333,12 @@ test("box-sizing:border-box child of a hidden elem (or unconnected node) has acc
        equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #10413" );
        equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #10413" );
 
-       equal( $divChild.height(), $divNormal.height(), "child of a hidden element height() is wrong see #10413" );
-       equal( $divChild.innerHeight(), $divNormal.innerHeight(), "child of a hidden element innerHeight() is wrong see #10413" );
-       equal( $divChild.outerHeight(), $divNormal.outerHeight(), "child of a hidden element outerHeight() is wrong see #10413" );
-       equal( $divChild.outerHeight(true), $divNormal.outerHeight( true ), "child of a hidden element outerHeight( true ) is wrong see #10413" );
+       // Support: IE 10-11, Edge
+       // Child height is not always decimal
+       equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #10413" );
+       equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #10413" );
+       equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #10413" );
+       equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #10413" );
 
        // tests that child div of an unconnected div works the same as a normal div
        equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #10413" );
@@ -340,10 +346,12 @@ test("box-sizing:border-box child of a hidden elem (or unconnected node) has acc
        equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #10413" );
        equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #10413" );
 
-       equal( $divUnconnected.height(), $divNormal.height(), "unconnected element height() is wrong see #10413" );
-       equal( $divUnconnected.innerHeight(), $divNormal.innerHeight(), "unconnected element innerHeight() is wrong see #10413" );
-       equal( $divUnconnected.outerHeight(), $divNormal.outerHeight(), "unconnected element outerHeight() is wrong see #10413" );
-       equal( $divUnconnected.outerHeight(true), $divNormal.outerHeight( true ), "unconnected element outerHeight( true ) is wrong see #10413" );
+       // Support: IE 10-11, Edge
+       // Child height is not always decimal
+       equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #10413" );
+       equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #10413" );
+       equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #10413" );
+       equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #10413" );
 
        // teardown html
        $divHiddenParent.remove();