Author: konstantin.mishin Date: 2008-01-08 12:45:35 -0500 (Tue, 08 Jan 2008) New Revision: 5190 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js Log: RF-726 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-08 17:18:23 UTC (rev 5189) +++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-08 17:45:35 UTC (rev 5190) @@ -102,12 +102,11 @@ this.helpObj = new ClientUI.common.box.Box(this.frozenContentBox.getElement(), null, true); this.defaultWidth = this.grid.getHeader().defaultWidth; + this.defaultHeight = this.headerRow.getElement().rows[0].cells[0].offsetHeight; if(ClientUILib.isGecko) { this.defaultHeight -= this.getBorderWidth("tb") + this.getPadding("tb"); //this.defaultWidth -= this.getBorderWidth("lr") + this.getPadding("lr"); - } else { - this.defaultHeight = this.headerRow.getElement().rows[0].cells[0].offsetHeight; - } + } this.frozenSubstrate = new ClientUI.common.box.Box(this.grid.getElement().id + ":fs", this.getElement()); this.frozenSubstrate.getElement().name = this.getElement().id + "FRFrm"; @@ -116,11 +115,10 @@ }, updateSize: function() { this.defaultWidth = this.grid.getHeader().defaultWidth; + this.defaultHeight = this.headerRow.getElement().rows[0].cells[0].offsetHeight; if(ClientUILib.isGecko) { this.defaultHeight -= this.getBorderWidth("tb") + this.getPadding("tb"); //this.defaultWidth -= this.getBorderWidth("lr") + this.getPadding("lr"); - } else { - this.defaultHeight = this.headerRow.getElement().rows[0].cells[0].offsetHeight; } this.setHeight(this.defaultHeight); this.setWidth(this.defaultWidth); 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-08 17:18:23 UTC (rev 5189) +++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-08 17:45:35 UTC (rev 5190) @@ -140,7 +140,7 @@ if(columns[j].sortable) Event.observe(cell, 'click', eventCellMouseDown); - h = cell.offsetHeigh; + h = cell.offsetHeight; if(h > defaultHeight) defaultHeight = h; defaultWidth += columns[j].width; columns[j].object = new ClientUI.common.box.InlineBox(cell, null, true); @@ -259,7 +259,7 @@ cells.each(function(cell) { if(i<columns.length) { columns[i].width = parseInt(cols[j].width); - h = cell.offsetHeigh; + h = cell.offsetHeight; if(h > defaultHeight) defaultHeight = h; defaultWidth += columns[i].width; } @@ -273,7 +273,7 @@ if(i<columns.length) { columns[i].width = parseInt(cols[j].width); - h = cell.offsetHeigh; + h = cell.offsetHeight; if(h > defaultHeight) defaultHeight = h; defaultWidth += columns[i].width; }