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

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

Author: konstantin.mishin
Date: 2008-01-28 13:42:41 -0500 (Mon, 28 Jan 2008)
New Revision: 5674

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

Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2008-01-28 17:01:31 UTC (rev 5673)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2008-01-28 18:42:41 UTC (rev 5674)
@@ -107,9 +107,11 @@
 		
 		this.helpObj = new ClientUI.common.box.Box(this.frozenContentBox.getElement(), null, true);
 
-		var fcount = this.headerFrozenRow.getElement().rows[0].cells.length;
-		var ncount = this.headerRow.getElement().rows[0].cells.length;
-		var columns = new Array(fcount + ncount);
+		var fcols = this.headerFrozenRow.getElement().getElementsByTagName("col");
+		this.fcount = fcols.length;
+		var cols = this.headerRow.getElement().getElementsByTagName("col");
+		this.ncount = cols.length;
+		var columns = new Array(this.fcount + this.ncount);
 		var defaultWidth = 0;
 		var defaultHeight = 0;
 		
@@ -117,16 +119,14 @@
 		
 		// Get columns information
 		var i = 0, h, j=0, cell;
-		var cols = this.headerFrozenRow.getElement().getElementsByTagName("col");
 		var cells = this.headerFrozenRow.getElement().rows[0].cells;
 		var ids = this.grid.options.ids;
-		var count = cells.length;
-		for(i=0; i<count; i++) {
+		for(i=0; i<this.fcount; i++) {
 			cell = cells[i];
 			columns[j] = {
 				columnId: ids[i],
-				col: cols[i],
-				width: parseInt(cols[i].width),
+				col: fcols[i],
+				width: parseInt(fcols[i].width),
 				styleClass: cell.className,
 				id: cell.id,
 				align: cell.align,
@@ -164,10 +164,8 @@
 			j++;
 		}
 
-		cols = this.headerRow.getElement().getElementsByTagName("col");
 		cells = this.headerRow.getElement().rows[0].cells;
-		count = cells.length;
-		for(i=0; i<count; i++) {
+		for(i=0; i<this.ncount; i++) {
 			cell = cells[i];
 
 			columns[j] = {
@@ -240,15 +238,14 @@
 		var i=0;
 		var fcells = this.headerFrozenRow.getElement().rows[0].cells;
 		var ncells = this.headerRow.getElement().rows[0].cells;
-		var length = fcells.length;
 		var delta = 4;
 		if (ncells[0].offsetWidth == ncells[0].clientWidth) {
 			delta--;
 		}
-		for(var j=0; j<length; i++,j++) {
+		for(var j=0; j<this.fcount; i++,j++) {
 			this._columns[i].sep.moveToX(fcells[j].offsetLeft + fcells[j].offsetWidth - delta);
 		}
-		var length = ncells.length - 1;
+		var length = this.ncount - 1;
 		for(var j=0; j<length; i++,j++) {
 			this._columns[i].sep.moveToX(ncells[j].offsetLeft + ncells[j].offsetWidth - delta);
 		}