[richfaces-svn-commits] JBoss Rich Faces SVN: r2485 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.

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

Author: konstantin.mishin
Date: 2007-08-24 13:16:39 -0400 (Fri, 24 Aug 2007)
New Revision: 2485

Modified:
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-661

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-08-24 16:08:59 UTC (rev 2484)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-08-24 17:16:39 UTC (rev 2485)
@@ -181,7 +181,6 @@
 				
 		this.rowsCount = Math.min(templNormal.rows.length, this.grid.dataModel.getCount());
 
-		this.defaultRowHeight = this._calcDefaultRowHeight();
 		//if(ClientUILib.isGecko) {
 		//	this.defaultRowHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
 		//}
@@ -242,9 +241,8 @@
 		this.contentBox.moveTo(frozenContentWidth, 0);		
 		this.sizeBox.moveTo(0, 0);
 		this.sizeBox.setWidth(totalWidth);
+		this.defaultRowHeight = this._calcDefaultRowHeight();
 		this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
-		this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
-		this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
 
 		this.scrollBox.setWidth(this.getWidth()+1);
 		this.scrollBox.setHeight(this.getHeight()+1);
@@ -267,6 +265,11 @@
 		this.frozenContentBox.setHeight(height - fixH);
 		this.container.setHeight(height - fixH);
 		
+		this.defaultRowHeight = this._calcDefaultRowHeight();
+		this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
+		this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
+		this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
+
 		var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft);
 		this.grid.adjustScrollPosition(scrollPos);