[richfaces-svn-commits] JBoss Rich Faces SVN: r2613 - in trunk/ui/scrollableDataTable/src/main/javascript/ClientUI: layouts and 1 other directory.

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

Author: konstantin.mishin
Date: 2007-08-30 10:25:24 -0400 (Thu, 30 Aug 2007)
New Revision: 2613

Modified:
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
Log:
RF-726

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-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-08-30 14:25:24 UTC (rev 2613)
@@ -231,7 +231,7 @@
 		this.scrollBox.setHeight(this.getHeight());		
 		
 		var scrollLeft = this.grid.getScrollOffset();
-		var height = this.scrollBox.getViewportHeight();
+		var height = this.scrollBox.getHeight();
 		var fixH = this.grid.getFooter() ? this.grid.getFooter().getHeight() : 0;
 		if(fixH > height) fixH = 0;
 		
@@ -241,8 +241,7 @@
 		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.sizeBox.setHeight(this.templNormal.getElement().offsetHeight);
 
 		this.scrollBox.setWidth(this.getWidth()+1);
 		this.scrollBox.setHeight(this.getHeight()+1);
@@ -258,7 +257,7 @@
 			this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
 		}
 		
-		height = this.scrollBox.getViewportHeight();
+		height = this.scrollBox.getHeight();
 				
 		this.contentBox.setHeight(height - fixH);		
 		this.frozenContentBox.setWidth(frozenContentWidth);
@@ -784,8 +783,8 @@
 	},
 	
 	_calcDefaultRowHeight: function() {
-		var templNormal = this.templNormal.getElement();
-		return Math.ceil(templNormal.offsetHeight / templNormal.rows.length);
+		//var templNormal = this.templNormal.getElement();
+		return this.templNormal.getElement().rows[1].offsetTop;//Math.ceil(templNormal.offsetHeight / templNormal.rows.length);
 		
 	}
 });

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js	2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js	2007-08-30 14:25:24 UTC (rev 2613)
@@ -139,7 +139,7 @@
 		}
 		ClientUI.controls.grid.GridFooter.parentClass.method("updateLayout").call(this);
 	
-		var height = this.getViewportHeight();
+		var height = this.getHeight();
 		var totalWidth = this.grid.getColumnsTotalWidth();
 		var frozenContentWidth = this.grid.getColumnsFrozenWidth();
 

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-08-30 14:25:24 UTC (rev 2613)
@@ -236,7 +236,7 @@
 		
 		this.frozenSubstrate = new ClientUI.common.box.Box(this.gridId + ":hs", this.getElement());
 		this.frozenSubstrate.getElement().name = this.getElement().id + "HRFrm";
-		this.frozenSubstrate.setHeight(this.headerRow.getViewportHeight());
+		this.frozenSubstrate.setHeight(this.headerRow.getHeight());
 
 		return true;
 	},
@@ -302,7 +302,7 @@
 			return;
 		}
 		ClientUI.controls.grid.GridHeader.parentClass.method("updateLayout").call(this);
-		var height = this.getViewportHeight();
+		var height = this.getHeight();
 		var totalWidth = this.grid.getColumnsTotalWidth();
 		var frozenContentWidth = this.grid.getColumnsFrozenWidth();
 

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js	2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js	2007-08-30 14:25:24 UTC (rev 2613)
@@ -38,7 +38,7 @@
 		
 		var parentBox = this.getContainer();
 		if(parentBox==null) parentBox = this;
-		var height = parentBox.getViewportHeight();
+		var height = parentBox.getHeight();
 		var width = parentBox.getViewportWidth();
 		
 		// NOTE: not implemented in this class
@@ -62,7 +62,7 @@
 	  			body.setHeight(bodyHeight);
 	  			body.moveTo(0, headerHeight);
 	  			body.updateLayout();
-				bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getViewportHeight();
+				bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getHeight();
 	  		}
 			
 	  		if(this.panels[GridLayout_Enum.FOOTER]) {

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js	2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js	2007-08-30 14:25:24 UTC (rev 2613)
@@ -62,7 +62,7 @@
 		
 		var parentBox = this.getContainer();
 		if(!parentBox) parentBox = this;
-		var height = parentBox.getViewportHeight();
+		var height = parentBox.getHeight();
 		var width = parentBox.getViewportWidth();
 		if(ClientUILib.isGecko) {
 			width -= parentBox.getBorderWidth("lr") + parentBox.getPadding("lr");