You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2007/11/08 23:35:08 UTC

svn commit: r593357 - /incubator/xap/trunk/codebase/src/dojo/src/html/layout.js

Author: jmargaris
Date: Thu Nov  8 15:35:04 2007
New Revision: 593357

URL: http://svn.apache.org/viewvc?rev=593357&view=rev
Log:
getPixelValue2 called with autoIsZero argument correctly,
fixed type in border determination

Modified:
    incubator/xap/trunk/codebase/src/dojo/src/html/layout.js

Modified: incubator/xap/trunk/codebase/src/dojo/src/html/layout.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/html/layout.js?rev=593357&r1=593356&r2=593357&view=diff
==============================================================================
--- incubator/xap/trunk/codebase/src/dojo/src/html/layout.js (original)
+++ incubator/xap/trunk/codebase/src/dojo/src/html/layout.js Thu Nov  8 15:35:04 2007
@@ -221,7 +221,7 @@
 		width: dojo.html.getBorderExtent2(node, ['border-left-style', 'border-left-width'], ['borderLeftStyle','borderLeftWidth']) + 
 			dojo.html.getBorderExtent2(node, ['border-right-style', 'border-right-width'], ['borderRightStyle','borderRightWidth']),
 		height: dojo.html.getBorderExtent2(node, ['border-top-style', 'border-top-width'], ['borderTopStyle','borderTopWidth']) + 
-			dojo.html.getBorderExtent2(node, ['border-bottom-right', 'border-bottom-width'], ['borderBottomStyle','borderBottomWidth'])
+			dojo.html.getBorderExtent2(node, ['border-bottom-style', 'border-bottom-width'], ['borderBottomStyle','borderBottomWidth'])
 	};	//	object
 }
 
@@ -256,7 +256,7 @@
 dojo.html.getBorderExtent2 = function(/* HTMLElement */node, cssSelector, propertyName){
 	//	summary
 	//	returns the width of the requested border
-	return (dojo.html.getStyle2(node, cssSelector[0], propertyName[0]) == 'none' ? 0 : dojo.html.getPixelValue2(node, cssSelector[1], propertyName[1]));	// integer
+	return (dojo.html.getStyle2(node, cssSelector[0], propertyName[0]) == 'none' ? 0 : dojo.html.getPixelValue2(node, cssSelector[1], true, propertyName[1]));	// integer
 }
 
 dojo.html.getPadding = function(/* HTMLElement */node){