Author: Alex.Kolonitsky Date: 2010-09-01 08:14:36 -0400 (Wed, 01 Sep 2010) New Revision: 19068 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java Log: fix renderer to render onheaderclick Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-09-01 11:06:10 UTC (rev 19067) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-09-01 12:14:36 UTC (rev 19068) @@ -26,6 +26,8 @@ import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.AbstractTogglePanelItem; import org.richfaces.component.AbstractTogglePanelTitledItem; +import org.richfaces.component.util.HtmlUtil; +import org.richfaces.renderkit.RenderKitUtils; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -35,6 +37,8 @@ import java.io.IOException; import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates; +import static org.richfaces.component.html.HtmlAccordionItem.PropertyKeys; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; /** * @@ -111,20 +115,28 @@ responseWriter.endElement("div"); } - private void encodeHeader(FacesContext facesContext, UIComponent component, ResponseWriter responseWriter) throws IOException { + private void encodeHeader(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { - responseWriter.startElement("div", component); - responseWriter.writeAttribute("class", "rf-aci-h " + attributeAsString(component, "contentClass"), null); - responseWriter.writeAttribute("id", component.getClientId() + ":header", null); + writer.startElement("div", component); + writer.writeAttribute("class", "rf-aci-h " + attributeAsString(component, PropertyKeys.headerClass), null); + writer.writeAttribute("id", component.getClientId() + ":header", null); + renderPassThroughAttributes(context, component, RenderKitUtils.attributes() + .generic("style", PropertyKeys.headerStyle.toString()) + .generic("onclick", PropertyKeys.onheaderclick.toString(), "headerclick") + .generic("ondblclick", PropertyKeys.onheaderdblclick.toString(), "headerdblclick") + .generic("onmousedown", PropertyKeys.onheadermousedown.toString(), "headermousedown") + .generic("onmousemove", PropertyKeys.onheadermousemove.toString(), "headermousemove") + .generic("onmouseup", PropertyKeys.onheadermouseup.toString(), "headermouseup") + ); AbstractTogglePanelTitledItem titledItem = (AbstractTogglePanelTitledItem) component; boolean isActive = titledItem.isActive(); boolean isDisabled = titledItem.isDisabled(); - encodeHeader(facesContext, titledItem, responseWriter, HeaderStates.inactive, !isActive && !isDisabled); - encodeHeader(facesContext, titledItem, responseWriter, HeaderStates.active, isActive && !isDisabled); - encodeHeader(facesContext, titledItem, responseWriter, HeaderStates.disable, isDisabled); + encodeHeader(context, titledItem, writer, HeaderStates.inactive, !isActive && !isDisabled); + encodeHeader(context, titledItem, writer, HeaderStates.active, isActive && !isDisabled); + encodeHeader(context, titledItem, writer, HeaderStates.disable, isDisabled); - responseWriter.endElement("div"); + writer.endElement("div"); } private void encodeHeader(FacesContext facesContext, AbstractTogglePanelTitledItem component, ResponseWriter writer, @@ -137,9 +149,8 @@ } String name = "headerClass" + capitalize(state.toString()); - writer.writeAttribute("class", "rf-aci-h-" + state + " " + attributeAsString(component, name), name); + writer.writeAttribute("class", HtmlUtil.concatClasses("rf-aci-h-" + state, attributeAsString(component, name)), null); - UIComponent headerFacet = component.getHeaderFacet(state); if (headerFacet != null && headerFacet.isRendered()) { headerFacet.encodeAll(facesContext);