Author: konstantin.mishin Date: 2010-09-27 15:25:28 -0400 (Mon, 27 Sep 2010) New Revision: 19348 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js Log: RF-9292 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-27 18:56:19 UTC (rev 19347) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-27 19:25:28 UTC (rev 19348) @@ -292,8 +292,8 @@ } } else { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" - + ("footer".equals(name) ? "ftr-" : "") + "cnt", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt" + + ("footer".equals(name) ? " rf-edt-ftr-cnt" : ""), null); } String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0); @@ -606,10 +606,6 @@ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - writer.startElement(HtmlConstants.DIV_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); - writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord", null); @@ -629,6 +625,10 @@ } writer.endElement(HtmlConstants.TABLE_ELEMENT); writer.startElement(HtmlConstants.DIV_ELEM, component); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); + writer.endElement(HtmlConstants.DIV_ELEM); + writer.startElement(HtmlConstants.DIV_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); @@ -683,7 +683,7 @@ UIDataTableBase table = state.getRow(); writer.startElement("style", table); writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/css", null); - writer.writeText(".rf-edt-cnt, .rf-edt-ftr-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) + writer.writeText("div.rf-edt-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) writer.writeText("width: 100%;", "width"); writer.writeText("}", null); Iterator<UIComponent> columns = table.columns(); Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-27 18:56:19 UTC (rev 19347) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-27 19:25:28 UTC (rev 19348) @@ -135,7 +135,7 @@ var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); var selectionInput = document.getElementById(id + ":si"); - var normalPartStyle = richfaces.utils.getCSSRule(".rf-edt-cnt, .rf-edt-ftr-cnt").style; + var normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var header = jQuery(element).children(".rf-edt-hdr"); var resizerHolders = header.find(".rf-edt-rsz-cntr"); @@ -183,7 +183,7 @@ } var height = element.clientHeight; var el = element.firstChild; - while (el) { + while (el && el.nodeName && el.nodeName.toUpperCase() != "TABLE") { if(el.nodeName && el.nodeName.toUpperCase() == "DIV" && el != bodyElement) { height -= el.offsetHeight; }