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

This reverts commit b60b26e18477d21fa5ec9c6572e114fc5d441730.

diff --git a/src/css.js b/src/css.js
index acd4bb3eb4f8465a45114c9dde5de7532b52809c..9b3a4638262a177d297c4280f393f787fc7be619 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -115,23 +115,22 @@ 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 val,
-               valueIsBorderBox = true,
+       var valueIsBorderBox = true,
+               val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
                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 ) {
-               val *= 100;
+
+               // 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 );
+               }
        }
 
        // Some non-html elements return undefined for offsetWidth, so check for null/undefined
@@ -321,14 +320,7 @@ 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" ) ) &&
-
-                                       // 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 ) ?
+                                       elem.offsetWidth === 0 ?
                                                swap( elem, cssShow, function() {
                                                        return getWidthOrHeight( elem, name, extra );
                                                } ) :

diff --git a/test/unit/css.js b/test/unit/css.js
index 8715c56d5a30290e5643a814ca79cb5e36a9698b..a8ab36756491365049665f757e77b540e1c92446 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -884,51 +884,6 @@ testIframeWithCallback(
        }
 );
 
-( 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 );
-
-       QUnit.test( "css('width') and css('height') should return fractional values for nodes in the document", function( assert ) {
-               if ( !supportsFractionalGBCR ) {
-                       assert.expect( 1 );
-                       assert.ok( true, "This browser doesn't support fractional values in getBoundingClientRect()" );
-                       return;
-               }
-
-               assert.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" );
-
-               assert.equal( Number( el.css( "width" ).replace( /px$/, "" ) ).toFixed( 1 ), "33.3",
-                       "css('width') should return fractional values" );
-               assert.equal( Number( el.css( "height" ).replace( /px$/, "" ) ).toFixed( 1 ), "88.8",
-                       "css('height') should return fractional values" );
-       } );
-
-       QUnit.test( "css('width') and css('height') should return fractional values for disconnected nodes", function( assert ) {
-               if ( !supportsFractionalGBCR ) {
-                       assert.expect( 1 );
-                       assert.ok( true, "This browser doesn't support fractional values in getBoundingClientRect()" );
-                       return;
-               }
-
-               assert.expect( 2 );
-
-               var el = jQuery( "<div style='width: 33.3px; height: 88.8px;'></div>" );
-
-               assert.equal( Number( el.css( "width" ).replace( /px$/, "" ) ).toFixed( 1 ), "33.3",
-                       "css('width') should return fractional values" );
-               assert.equal( Number( el.css( "height" ).replace( /px$/, "" ) ).toFixed( 1 ), "88.8",
-                       "css('height') should return fractional values" );
-       } );
-} )();
-
 QUnit.test( "certain css values of 'normal' should be convertable to a number, see #8627", function( assert ) {
        assert.expect( 3 );
 

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 22b3f019823afbc08c35600cbbea0bb63a7b454c..00139a8c2ce573c481eff9034d2760490899a6d4 100644 (file)
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -251,12 +251,10 @@ QUnit.test( "child of a hidden elem (or unconnected node) has accurate inner/out
        assert.equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #9441" );
        assert.equal( $divChild.outerWidth( true ), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #9300" );
 
-       // Support: IE 10-11, Edge
-       // Child height is not always decimal
-       assert.equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #9441" );
-       assert.equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #9441" );
-       assert.equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #9441" );
-       assert.equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #9300" );
+       assert.equal( $divChild.height(), $divNormal.height(), "child of a hidden element height() is wrong see #9441" );
+       assert.equal( $divChild.innerHeight(), $divNormal.innerHeight(), "child of a hidden element innerHeight() is wrong see #9441" );
+       assert.equal( $divChild.outerHeight(), $divNormal.outerHeight(), "child of a hidden element outerHeight() is wrong see #9441" );
+       assert.equal( $divChild.outerHeight(true), $divNormal.outerHeight( true ), "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
        assert.equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #9441" );
@@ -264,12 +262,10 @@ QUnit.test( "child of a hidden elem (or unconnected node) has accurate inner/out
        assert.equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #9441" );
        assert.equal( $divUnconnected.outerWidth( true ), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #9300" );
 
-       // Support: IE 10-11, Edge
-       // Child height is not always decimal
-       assert.equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #9441" );
-       assert.equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #9441" );
-       assert.equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #9441" );
-       assert.equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #9300" );
+       assert.equal( $divUnconnected.height(), $divNormal.height(), "unconnected element height() is wrong see #9441" );
+       assert.equal( $divUnconnected.innerHeight(), $divNormal.innerHeight(), "unconnected element innerHeight() is wrong see #9441" );
+       assert.equal( $divUnconnected.outerHeight(), $divNormal.outerHeight(), "unconnected element outerHeight() is wrong see #9441" );
+       assert.equal( $divUnconnected.outerHeight(true), $divNormal.outerHeight( true ), "unconnected element outerHeight( true ) is wrong see #9300" );
 
        // teardown html
        $divHiddenParent.remove();
@@ -328,12 +324,10 @@ QUnit.test( "box-sizing:border-box child of a hidden elem (or unconnected node)
        assert.equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #10413" );
        assert.equal( $divChild.outerWidth( true ), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #10413" );
 
-       // Support: IE 10-11, Edge
-       // Child height is not always decimal
-       assert.equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #10413" );
-       assert.equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #10413" );
-       assert.equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #10413" );
-       assert.equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #10413" );
+       assert.equal( $divChild.height(), $divNormal.height(), "child of a hidden element height() is wrong see #10413" );
+       assert.equal( $divChild.innerHeight(), $divNormal.innerHeight(), "child of a hidden element innerHeight() is wrong see #10413" );
+       assert.equal( $divChild.outerHeight(), $divNormal.outerHeight(), "child of a hidden element outerHeight() is wrong see #10413" );
+       assert.equal( $divChild.outerHeight(true), $divNormal.outerHeight( true ), "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
        assert.equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #10413" );
@@ -341,12 +335,10 @@ QUnit.test( "box-sizing:border-box child of a hidden elem (or unconnected node)
        assert.equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #10413" );
        assert.equal( $divUnconnected.outerWidth( true ), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #10413" );
 
-       // Support: IE 10-11, Edge
-       // Child height is not always decimal
-       assert.equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #10413" );
-       assert.equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #10413" );
-       assert.equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #10413" );
-       assert.equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #10413" );
+       assert.equal( $divUnconnected.height(), $divNormal.height(), "unconnected element height() is wrong see #10413" );
+       assert.equal( $divUnconnected.innerHeight(), $divNormal.innerHeight(), "unconnected element innerHeight() is wrong see #10413" );
+       assert.equal( $divUnconnected.outerHeight(), $divNormal.outerHeight(), "unconnected element outerHeight() is wrong see #10413" );
+       assert.equal( $divUnconnected.outerHeight(true), $divNormal.outerHeight( true ), "unconnected element outerHeight( true ) is wrong see #10413" );
 
        // teardown html
        $divHiddenParent.remove();