Author: piotr.buda Date: 2008-08-04 09:49:38 -0400 (Mon, 04 Aug 2008) New Revision: 9890 Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx Log: Some fixes (mainly table redrawing) Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2008-08-04 13:33:56 UTC (rev 9889) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2008-08-04 13:49:38 UTC (rev 9890) @@ -224,7 +224,9 @@ String groupColId = getGroupingColumnId(); // try to add group column id as first - //TODO nick - is it ok to change user's priorities collection here? + //TODO nick - is it ok to change user's priorities collection here? + //PBU it is used in grouping mode - grouping column must be sorted + //as first if (priority.contains(groupColId)) { priority.remove(groupColId); } 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-08-04 13:33:56 UTC (rev 9889) +++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-08-04 13:49:38 UTC (rev 9890) @@ -111,7 +111,7 @@ }, setColumnWidth: function(columnIndex, newWidth) { - if (columnIndex >= this.getColumnsNumber) { + if (columnIndex >= this.getColumnsNumber()) { return false; }else{ if (!newWidth) { @@ -227,7 +227,7 @@ this.maxDelta = this.getColumnWidth(this.getColumnsNumber()-1); this.maxDelta -= this.extDt.getScrollbarWidth(); if (ClientUILib.isOpera) { - this.maxDelt -= 1; + this.maxDelta -= 1; }; this.minDelta = this.minColumnWidth - this.getColumnWidth(srcElement.columnIndex); Event.observe(document, 'mousemove', this.eventSepMouseMove, true); @@ -320,11 +320,13 @@ Event.stop(event); } }, - _redrawTable: function(table) { - var tr = table.insertRow(0); - var td = tr.insertCell(0); - td.setAttribute("colspan", 5); - td.innerHTML = "safari-must-have-something-inserted-to-redraw-table"; - table.deleteRow(tr); + _redrawTable: function(table) { + table.hide(); + var tr = table.insertRow(0); + var td = tr.insertCell(0); + td.setAttribute("colspan", 5); + td.innerHTML = "safari-must-have-something-inserted-to-redraw-table"; + table.deleteRow(tr); + table.show(); } }); \ No newline at end of file Modified: trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-04 13:33:56 UTC (rev 9889) +++ trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-04 13:49:38 UTC (rev 9890) @@ -87,8 +87,8 @@ <colgroup id="#{clientId}:colgroup:header"> <f:call name="encodeColumns"/> </colgroup> + <f:call name="encodeCaption" /> <f:call name="encodeHeader"/> - <f:call name="encodeCaption"/> <tbody> <tr> <td colspan="#{columnsCount}" style="padding: 0px;">