Author: dmorozov Date: 2007-09-10 12:27:16 -0400 (Mon, 10 Sep 2007) New Revision: 2842 Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js Log: Fix bug http://jira.jboss.com/jira/browse/RF-878 Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-09-10 16:22:53 UTC (rev 2841) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-09-10 16:27:16 UTC (rev 2842) @@ -360,12 +360,13 @@ setFakeColumnWidth: function() { var columns = this.grid.getHeader().getColumns(); - columns.last().bodyCol.width = 1; + var bodyCell = columns.last().bodyCol; + if(bodyCell) bodyCell.width = 1; var width = this.grid.getElement().offsetWidth - this.fTable.offsetWidth - this.nTable.offsetWidth; if (width < 1) { width = 1; } - columns.last().bodyCol.width = width; + if(bodyCell) bodyCell.width = width; }, startLoadData: function() { @@ -784,7 +785,11 @@ _calcDefaultRowHeight: function() { //var templNormal = this.templNormal.getElement(); - return this.templNormal.getElement().rows[1].offsetTop;//Math.ceil(templNormal.offsetHeight / templNormal.rows.length); + // var height = Math.ceil(templNormal.offsetHeight / templNormal.rows.length); + var height = (this.templNormal && this.templNormal.getElement() && + this.templNormal.getElement().rows && + this.templNormal.getElement().rows.length>1) ? this.templNormal.getElement().rows[1].offsetTop : 16; + return height; } }); Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-10 16:22:53 UTC (rev 2841) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-10 16:27:16 UTC (rev 2842) @@ -427,10 +427,12 @@ } } */ + var rows = this.grid.getBody().templFrozen.getElement().rows; + var startRow = rows && rows.length>0 ? this.grid.getBody()._getRowIndex(rows[0].id) : 0; this.grid.eventOnSort.fire({ column: index, /*order: dir,*/ - startRow: this.grid.getBody()._getRowIndex(this.grid.getBody().templFrozen.getElement().rows[0].id), + startRow: startRow, index: this.grid.getBody().currRange.start }); Event.stop(event);