[richfaces-svn-commits] JBoss Rich Faces SVN: r4957 - branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.

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

Author: konstantin.mishin
Date: 2007-12-21 13:08:27 -0500 (Fri, 21 Dec 2007)
New Revision: 4957

Modified:
   branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-1592

Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-12-21 16:55:49 UTC (rev 4956)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-12-21 18:08:27 UTC (rev 4957)
@@ -139,35 +139,34 @@
 		this.sizeBox.setHeight(this.templNormal.getElement().offsetHeight);
 	},
 	parseTemplate: function(templFrozen, templNormal) {
-		if(!templNormal || !templNormal.rows || templNormal.rows.length===0) {
-			return false;
+		var result = false;
+		if(templNormal && templNormal.rows && templNormal.rows.length != 0) {
+			var columns = this.grid.getHeader().getColumns();
+			var i=0, j=0;
+			var cols = this.templFrozen.getElement().getElementsByTagName("col");
+			for(i=0; i<cols.length; i++) {
+				columns[j].bodyCol = $(cols[i]);
+				j++;
+			}
+			cols = this.templNormal.getElement().getElementsByTagName("col");
+			for(i=0; i<cols.length; i++) {
+				columns[j].bodyCol = $(cols[i]);
+				j++;
+			}
+					
+			this.rowsCount = Math.min(templNormal.rows.length, this.grid.dataModel.getCount());
+
+			//if(ClientUILib.isGecko) {
+			//	this.defaultRowHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
+			//}
+			this.helpObj = new ClientUI.common.box.Box(templFrozen, null, true);
+			this.countToLoad = 0;
+			this.startRow = 0;
+			this.startIndex = 0;
+			result = true;
 		}
-		
-		var columns = this.grid.getHeader().getColumns();
-		var i=0, j=0;
-		var cols = this.templFrozen.getElement().getElementsByTagName("col");
-		for(i=0; i<cols.length; i++) {
-			columns[j].bodyCol = $(cols[i]);
-			j++;
-		}
-		cols = this.templNormal.getElement().getElementsByTagName("col");
-		for(i=0; i<cols.length; i++) {
-			columns[j].bodyCol = $(cols[i]);
-			j++;
-		}
-				
-		this.rowsCount = Math.min(templNormal.rows.length, this.grid.dataModel.getCount());
-
-		//if(ClientUILib.isGecko) {
-		//	this.defaultRowHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
-		//}
-		this.helpObj = new ClientUI.common.box.Box(templFrozen, null, true);
-		this.countToLoad = 0;
-		this.startRow = 0;
-		this.startIndex = 0;
 		this.currRange = $R(0, this.rowsCount);	
-		
-		return true;		
+		return result;		
 	},
 	setScrollPos: function(pos) {
 		this.contentBox.getElement().scrollTop = pos;
@@ -334,8 +333,10 @@
 		}.bind(this), this.grid.dataModel.getRequestDelay());
 	},
 	adjustColumnWidth: function(column, width) {
-		var columns = this.grid.getHeader().getColumns();
-		columns[column].bodyCol.width = width>0 ? width : 1;
+		var bodyCol = this.grid.getHeader().getColumns()[column].bodyCol;
+		if (bodyCol) {
+			bodyCol.width = width>0 ? width : 1;
+		}
 	},
 	
 	setFakeColumnWidth: function() {