Author: Alex.Kolonitsky Date: 2010-09-01 09:59:09 -0400 (Wed, 01 Sep 2010) New Revision: 19072 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TogglePanel.js Log: RF-9275 Accordion: server switch type opens new window in IE8 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java 2010-09-01 13:45:43 UTC (rev 19071) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java 2010-09-01 13:59:09 UTC (rev 19072) @@ -27,7 +27,6 @@ /** * @author akolonitsky * @version 1.0 - * @since -4712-01-01 * */ public abstract class AbstractDivPanel extends UIOutput { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-09-01 13:45:43 UTC (rev 19071) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-09-01 13:59:09 UTC (rev 19072) @@ -375,7 +375,7 @@ String previous = (String) getValue(); setValue(activeItem); setSubmittedActiveItem(null); - if (!previous.equalsIgnoreCase(activeItem)) { + if (previous != null && !previous.equalsIgnoreCase(activeItem)) { queueEvent(new ItemChangeEvent(this, previous, activeItem)); } } 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 13:45:43 UTC (rev 19071) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-09-01 13:59:09 UTC (rev 19072) @@ -26,7 +26,6 @@ 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; @@ -38,6 +37,7 @@ import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates; import static org.richfaces.component.html.HtmlAccordionItem.PropertyKeys; +import static org.richfaces.component.util.HtmlUtil.concatClasses; import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; /** @@ -67,6 +67,14 @@ }) public class AccordionItemRenderer extends TogglePanelItemRenderer { + private static final RenderKitUtils.Attributes HEADER_ATTRIBUTES = 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"); + @Override protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); @@ -78,7 +86,7 @@ @Override protected String getStyleClass(UIComponent component) { - return "rf-aci " + attributeAsString(component, "styleClass"); + return concatClasses("rf-aci", attributeAsString(component, "styleClass")); } @Override @@ -103,7 +111,7 @@ private void encodeContentBegin(UIComponent component, ResponseWriter writer) throws IOException { writer.startElement("div", component); - writer.writeAttribute("class", "rf-aci-c " + attributeAsString(component, "contentClass"), null); + writer.writeAttribute("class", concatClasses("rf-aci-c", attributeAsString(component, "contentClass")), null); writer.writeAttribute("id", component.getClientId() + ":content", null); if (!((AbstractTogglePanelItem) component).isActive()) { @@ -118,16 +126,9 @@ private void encodeHeader(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { writer.startElement("div", component); - writer.writeAttribute("class", "rf-aci-h " + attributeAsString(component, PropertyKeys.headerClass), null); + writer.writeAttribute("class", concatClasses("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") - ); + renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES); AbstractTogglePanelTitledItem titledItem = (AbstractTogglePanelTitledItem) component; boolean isActive = titledItem.isActive(); @@ -149,7 +150,7 @@ } String name = "headerClass" + capitalize(state.toString()); - writer.writeAttribute("class", HtmlUtil.concatClasses("rf-aci-h-" + state, attributeAsString(component, name)), null); + writer.writeAttribute("class", concatClasses("rf-aci-h-" + state, attributeAsString(component, name)), null); UIComponent headerFacet = component.getHeaderFacet(state); if (headerFacet != null && headerFacet.isRendered()) { Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TogglePanel.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TogglePanel.js 2010-09-01 13:45:43 UTC (rev 19071) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TogglePanel.js 2010-09-01 13:59:09 UTC (rev 19072) @@ -66,7 +66,7 @@ this.__setActiveItem(newPanel.getName()); - rf.submitForm(this.__getParentForm(), null, {}); + rf.submitForm(this.__getParentForm()); return false; },