Author: konstantin.mishin Date: 2011-02-03 14:44:13 -0500 (Thu, 03 Feb 2011) New Revision: 21431 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-10076 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 2011-02-03 19:43:19 UTC (rev 21430) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-02-03 19:44:13 UTC (rev 21431) @@ -397,6 +397,8 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-b", null); if (table.getRowCount() == 0) { UIComponent facet = table.getFacet("noData"); + writer.startElement(HtmlConstants.DIV_ELEM, table); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ndt", null); if (facet != null && facet.isRendered()) { facet.encodeAll(context); } else { @@ -405,6 +407,7 @@ writer.writeText(noDataLabel, "noDataLabel"); } } + writer.endElement(HtmlConstants.DIV_ELEM); } else { table.getAttributes().put("clientFirst", 0); writer.startElement(HtmlConstants.DIV_ELEM, table); 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 2011-02-03 19:43:19 UTC (rev 21430) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2011-02-03 19:44:13 UTC (rev 21431) @@ -361,7 +361,7 @@ this.bodyElement.tabIndex = -1; //TODO don't use tabIndex. this.normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var bodyJQuery = jQuery(this.bodyElement); - this.contentElement = bodyJQuery.children("div:first")[0]; + this.contentElement = bodyJQuery.children("div:not(.rf-edt-ndt):first")[0]; if (this.contentElement) { this.spacerElement = this.contentElement.firstChild;//TODO this.marginElement = Richfaces.firstDescendant(this.contentElement); this.dataTableElement = this.contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);