[richfaces-svn-commits] JBoss Rich Faces SVN: r2843 - in trunk/ui/scrollableDataTable/src: test/java/org/richfaces/renderkit/html and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: maksimkaszynski
Date: 2007-09-10 12:53:17 -0400 (Mon, 10 Sep 2007)
New Revision: 2843

Modified:
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
   trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
Log:
http://jira.jboss.com/jira/browse/RF-874

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js	2007-09-10 16:27:16 UTC (rev 2842)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js	2007-09-10 16:53:17 UTC (rev 2843)
@@ -62,7 +62,7 @@
 	  			body.setHeight(bodyHeight);
 	  			body.moveTo(0, headerHeight);
 	  			body.updateLayout();
-				bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getHeight();
+				bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getViewportHeight();
 	  		}
 			
 	  		if(this.panels[GridLayout_Enum.FOOTER]) {

Modified: trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
===================================================================
--- trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java	2007-09-10 16:27:16 UTC (rev 2842)
+++ trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java	2007-09-10 16:53:17 UTC (rev 2843)
@@ -1,5 +1,6 @@
 package org.richfaces.renderkit.html;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -113,6 +114,11 @@
         }
 	}
 
+	static final Set tagNames = new HashSet();
+	static final String [] names = {"input","div","script"};
+	static {
+		Collections.addAll(tagNames, names);
+	}
 	
 	public void testRenderingFrozenNormalColumns()throws Exception{
 		
@@ -151,7 +157,7 @@
 			HtmlElement elem = (HtmlElement) childIter.next();
 			assertNotNull(elem);
 			
-			boolean res = (elem.getNodeName().equals("div") || elem.getNodeName().equals("input"));
+			boolean res = tagNames.contains(elem.getNodeName().toLowerCase());
 			assertTrue(res);
 			
 			if(elem.getNodeName().equals("div")){