Author: bleathem Date: 2013-07-08 18:16:06 -0400 (Mon, 08 Jul 2013) New Revision: 23246 Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js Log: RF-7173: Back-ported the fix from RF 3.3.3.Final Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2013-07-08 16:51:27 UTC (rev 23245) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2013-07-08 22:16:06 UTC (rev 23246) @@ -398,8 +398,11 @@ cols[columnsNumber-1].width = null; cols[cols.length-1].width = null; var newHeight = mainDivHeight - header.getHeight() - footerHeight - 2; - newHeight -= this.header.getCaptionHeight(); - scrollingDiv.setStyle('height:'+ newHeight +'px;'); + var caption = header.getCaption() + if (caption && caption.tagName == "caption") { + newHeight -= this.header.getCaptionHeight(); + } + scrollingDiv.setStyle('height:'+ newHeight +'px;'); this._redrawTable(table); header.adjustSeparators(); this._redrawTable(this.tableB); Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2013-07-08 16:51:27 UTC (rev 23245) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2013-07-08 22:16:06 UTC (rev 23246) @@ -72,7 +72,7 @@ getHeight: function() { var el = this.getElement(); if(el.tagName.toLowerCase() != "body") { - var h = el.getHeight(); // offsetHeight; RF-7173 + var h = el.offsetHeight; return h>0 ? h : (this.element.boxHeight ? parseInt(this.element.boxHeight) : 0); }