Landing pull request 413. Move border/padding checks to after width validation to...

More Details:
 - https://github.com/jquery/jquery/pull/413
 - http://bugs.jquery.com/ticket/9300
 - http://bugs.jquery.com/ticket/9441
 - http://bugs.jquery.com/ticket/9598

diff --git a/src/css.js b/src/css.js
index c60bcdde040d421be86048fe15bdf30f41842a2c..cb7df9f80faf6bedd486730bd49e08df31520e5a 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -315,21 +315,20 @@ function getWH( elem, name, extra ) {
        var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
                which = name === "width" ? cssWidth : cssHeight;
 
-       if ( extra !== "margin" && extra !== "border" ) {
-               jQuery.each( which, function() {
-                       val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
-                       if ( !extra ) {
-                               val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
-                       }
-               });
-       }
-
        if ( val > 0 ) {
-               if ( extra === "margin" ) {
+               if ( extra !== "border" ) {
                        jQuery.each( which, function() {
-                               val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+                               if ( !extra ) {
+                                       val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
+                               }
+                               if ( extra === "margin" ) {
+                                       val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+                               } else {
+                                       val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
+                               }
                        });
                }
+
                return val + "px";
        }