From d143f76973d5368389e760c73ae0c61113cb1c6a Mon Sep 17 00:00:00 2001 From: John Resig Date: Sun, 18 Jun 2006 01:23:08 +0000 Subject: [PATCH 1/1] Changed border stuff to borderTopWidth (Ticket #9) --- jquery/jquery.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jquery/jquery.js b/jquery/jquery.js index 6ff825b..b938b5b 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -355,13 +355,13 @@ $.getCSS = function(e,p) { if ( p == 'height' || p == 'width' ) { // Handle extra width/height provided by the W3C box model - var ph = !$.boxModel ? 0 : + var ph = (!$.boxModel ? 0 : parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) + - parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom")) || 0; + parseInt($.css(e,"borderTopWidth")) + parseInt($.css(e,"borderBottomWidth"))) || 0; - var pw = !$.boxModel ? 0 : + var pw = (!$.boxModel ? 0 : parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) + - parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight")) || 0; + parseInt($.css(e,"borderLeftWidth")) + parseInt($.css(e,"borderRightWidth"))) || 0; var oHeight, oWidth; -- 1.7.10.4