Author: pkawiak Date: 2008-07-28 08:39:57 -0400 (Mon, 28 Jul 2008) New Revision: 9803 Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js Log: Rendering images on ff3 bug Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-28 11:52:51 UTC (rev 9802) +++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-28 12:39:57 UTC (rev 9803) @@ -346,10 +346,7 @@ cols[cols.length-1].width = null; } var newHeight = mainDivHeight - header.getHeight() - footerHeight - 2; - var captions = this.table.getElement().getElementsByTagName('caption'); - if (captions.length > 0) { - newHeight -= captions[0].offsetHeight; - } + newHeight -= this.header.getCaptionHeight(); ClientUILib.log(ClientUILogger.INFO, "footerHeight: " + footerHeight); scrollingDiv.setStyle('height:'+ newHeight +'px;'); for (var i=0; i<headerChildren.length-1; i++) { Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-28 11:52:51 UTC (rev 9802) +++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-28 12:39:57 UTC (rev 9803) @@ -14,7 +14,7 @@ this.eventSepMouseMove = this.OnSepMouseMove.bindAsEventListener(this); this.eventSepMouseUp = this.OnSepMouseUp.bindAsEventListener(this); this.eventHeaderCellMouseOver = this.OnHeaderCellMouseOver.bindAsEventListener(this); - this.eventHeaderCellMouseOut = this.OnHeaderCellMouseOut.bindAsEventListener(this); + this.eventHeaderCellMouseOut = this.OnHeaderCellMouseOut.bindAsEventListener(this); var showMenuFct = this.extDt.options.showMenuFunction; if (showMenuFct) { @@ -30,7 +30,20 @@ var menuDiv = $(el.id+"header:menuDiv"); menuDiv.className = "extdt-menu-div-on"; }, + + getCaption: function() { + return this.caption; + }, + getCaptionHeight: function() { + var caption = this.getCaption(); + if (caption) { + return caption.getHeight(); + }else{ + return 0; + } + }, + OnHeaderCellMouseOut: function(event) { var el = this.extDt._findParentElement(event, "th"); var menuDiv = $(el.id+"header:menuDiv"); @@ -154,7 +167,7 @@ var headerChildChildren = headerChild.childElements(); var sepSpan = headerChildChildren[2]; var headerRowHeight = this.headerRow.getHeight(); - var headerRowY = this.headerRow.getY(); + var headerRowY = this.getCaptionHeight(); sepSpan.columnIndex = i; var sd = sepSpan.getWidth()/2 + 1; var dropSpanLeft = headerChildChildren[3];