Changeset 72

Timestamp:

06/16/06 00:09:51 (3 years ago)

Author:

john

Message:

$.css() now accounts for borders in addition to padding when calculating the height/width of an element.

Files:

• jquery/jquery/jquery.js (modified) (1 diff)

jquery/jquery/jquery.js

@@ -354 +354 @@
     // Adapted from Prototype 1.4.0
     if ( p == 'height' || p == 'width' ) {
-        var ph = $.browser == "msie" ? 0 : 
-            parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom"));
-        var pw = $.browser == "msie" ? 0 : 
-            parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight"));
+
+        // Handle extra width/height provided by the W3C box model
+        var ph = !$.boxModel ? 0 : 
+            parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) +
+            parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom"));
+
+        var pw = !$.boxModel ? 0 : 
+            parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) +
+            parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight"));
 
         var oHeight, oWidth;