]> source.dussan.org Git - jquery.git/commitdiff
$.css() now accounts for borders in addition to padding when calculating the height...
authorJohn Resig <jeresig@gmail.com>
Fri, 16 Jun 2006 00:09:51 +0000 (00:09 +0000)
committerJohn Resig <jeresig@gmail.com>
Fri, 16 Jun 2006 00:09:51 +0000 (00:09 +0000)
jquery/jquery.js

index b7a2799a5ecd4f69b60596eb54e0d33a8f444389..3e7ffa67d688b717d1286d2df514f2bb21fc9047 100644 (file)
@@ -353,10 +353,15 @@ $.apply = function(o,f,a) {
 $.getCSS = function(e,p) {
        // 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;