X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=b938b5b8a327e7529641a0d777c92c238e6aa6d4;hb=d143f76973d5368389e760c73ae0c61113cb1c6a;hp=6ff825b9355f64d6709b925c582cdd54754e083b;hpb=d584a884b6377553d6ba544c10484dc2a866caee;p=jquery.git

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;