Author: amarkhel Date: 2010-12-02 13:06:35 -0500 (Thu, 02 Dec 2010) New Revision: 20317 Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/dropdownmenu.template.xml sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml Log: @ResourceDependencies was added to wrap @ResourceDependency Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -23,7 +23,7 @@ @Attribute public abstract String getShowEvent(); - @Attribute + @Attribute(defaultValue = MenuComponent.MODE_SERVER) public abstract String getMode(); @Attribute @@ -33,8 +33,17 @@ public abstract int getHideDelay(); @Attribute(defaultValue = "800") - public abstract int getShowDelay(); + public abstract int getShowDelay(); + @Attribute(defaultValue = "250") + public abstract int getPopupWith(); + + @Attribute(defaultValue = "auto") + public abstract String getJointPoint(); + + @Attribute(defaultValue = "auto") + public abstract String getDirection(); + @Attribute(events = @EventName("groupshow")) public abstract String getOngroupshow(); @@ -47,6 +56,9 @@ @Attribute(events = @EventName("hide")) public abstract String getOnhide(); + @Attribute(events = @EventName("itemclick")) + public abstract String getOnitemclick(); + public enum Facets { LABEL("label"), LABEL_DISABLED("labelDisabled"); Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -38,11 +38,14 @@ @Attribute public abstract String getStyle(); + @Attribute(defaultValue = "auto") + public abstract String getDirection(); + @Attribute(defaultValue = "0") - public abstract int getVerticalOffset(); + public abstract String getVerticalOffset(); @Attribute(defaultValue = "0") - public abstract int getHorizontalOffset(); + public abstract String getHorizontalOffset(); @Attribute(events = @EventName("show")) public abstract String getOnshow(); Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -51,5 +51,4 @@ return facetName; } } - } Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -34,6 +34,8 @@ public static final String RENDERER_TYPE = "org.richfaces.DropDownMenuRenderer"; + public static final int DEFAULT_MIN_POPUP_WIDTH = 250; + @Override public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException { AbstractDropDownMenu dropDownMenu = (AbstractDropDownMenu) component; @@ -49,14 +51,14 @@ } } - protected boolean isDisabled(UIComponent component) { + protected boolean isDisabled(FacesContext facesContext, UIComponent component) { if (component instanceof AbstractDropDownMenu) { return ((AbstractDropDownMenu) component).isDisabled(); } return false; } - protected UIComponent getLabelFacet(UIComponent component) { + protected UIComponent getLabelFacet(FacesContext facesContext, UIComponent component) { UIComponent facet = null; AbstractDropDownMenu ddmenu = (AbstractDropDownMenu) component; if (ddmenu != null) { @@ -80,6 +82,7 @@ map.put("id", group.getClientId()); map.put("horizontalOffset", group.getHorizontalOffset()); map.put("verticalOffset", group.getVerticalOffset()); + map.put("direction", group.getDirection()); RenderKitUtils.addToScriptHash(map, "onhide", group.getOnhide(), null, ScriptHashVariableWrapper.eventHandler); RenderKitUtils.addToScriptHash(map, "onshow", group.getOnshow(), null, ScriptHashVariableWrapper.eventHandler); results.add(map); @@ -97,5 +100,12 @@ getMenuGroups(c, list); } } + } + + protected int getMinPopupWidth(FacesContext facesContext, UIComponent component) { + if (component instanceof AbstractDropDownMenu) { + ((AbstractDropDownMenu) component).getPopupWith(); + } + return DEFAULT_MIN_POPUP_WIDTH; } } Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -13,12 +13,14 @@ public static final String RENDERER_TYPE = "org.richfaces.MenuGroupRenderer"; + public static final int DEFAULT_MIN_POPUP_WIDTH = 250; + @Override public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException { } - protected boolean isDisabled(UIComponent component) { + protected boolean isDisabled(FacesContext facesContext, UIComponent component) { if (component instanceof AbstractMenuGroup) { return ((AbstractMenuGroup) component).isDisabled(); } @@ -36,7 +38,7 @@ } } - protected UIComponent getIconFacet(UIComponent component) { + protected UIComponent getIconFacet(FacesContext facesContext, UIComponent component) { UIComponent facet = null; AbstractMenuGroup menuGroup = (AbstractMenuGroup) component; if (menuGroup != null) { @@ -50,7 +52,7 @@ return facet; } - protected String getIconAttribute(UIComponent component) { + protected String getIconAttribute(FacesContext facesContext, UIComponent component) { String icon = null; AbstractMenuGroup menuGroup = (AbstractMenuGroup) component; if (menuGroup != null) { @@ -64,8 +66,8 @@ return icon; } - protected String getStyleClass(UIComponent component, String styleDDMenu, String styleMenuGroup) { - UIComponent ddMenu = getDDMenu(component); + protected String getStyleClass(FacesContext facesContext, UIComponent component, String styleDDMenu, String styleMenuGroup) { + UIComponent ddMenu = getDDMenu(facesContext, component); String styleClass = ""; if (ddMenu != null) { if (ddMenu.getAttributes().get(styleDDMenu) != null) { @@ -76,7 +78,7 @@ return concatClasses(styleClass, component.getAttributes().get(styleMenuGroup)); } - protected UIComponent getDDMenu(UIComponent component) { + protected UIComponent getDDMenu(FacesContext facesContext, UIComponent component) { UIComponent parent = component.getParent(); while (parent != null) { if (parent instanceof AbstractDropDownMenu) { @@ -86,4 +88,12 @@ } return null; } + + protected int getMinPopupWidth(FacesContext facesContext, UIComponent component) { + UIComponent parent = getDDMenu(facesContext, component); + if (parent != null) { + return ((AbstractDropDownMenu) parent).getPopupWith(); + } + return DEFAULT_MIN_POPUP_WIDTH; + } } Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-12-02 18:06:35 UTC (rev 20317) @@ -1,8 +1,13 @@ package org.richfaces.renderkit.html; +import java.util.HashMap; +import java.util.Map; + import javax.faces.component.UIComponent; +import javax.faces.component.UIForm; import javax.faces.context.FacesContext; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.AbstractDropDownMenu; import org.richfaces.component.AbstractMenuGroup; import org.richfaces.component.AbstractMenuItem; @@ -13,14 +18,14 @@ public static final String RENDERER_TYPE = "org.richfaces.MenuItemRenderer"; - protected boolean isDisabled(UIComponent component) { + protected boolean isDisabled(FacesContext facesContext, UIComponent component) { if (component instanceof AbstractMenuItem) { return ((AbstractMenuItem) component).isDisabled(); } return false; } - protected UIComponent getIconFacet(UIComponent component) { + protected UIComponent getIconFacet(FacesContext facesContext, UIComponent component) { UIComponent facet = null; AbstractMenuItem menuItem = (AbstractMenuItem) component; if (menuItem != null) { @@ -34,7 +39,7 @@ return facet; } - protected String getIconAttribute(UIComponent component) { + protected String getIconAttribute(FacesContext facesContext, UIComponent component) { String icon = null; AbstractMenuItem menuItem = (AbstractMenuItem) component; if (menuItem != null) { @@ -60,13 +65,42 @@ } } - protected String getOnClickFunction(UIComponent component) { + private UIComponent getUIForm(UIComponent component) { + if (component != null) { + UIComponent parent = component.getParent(); + while (parent != null) { + if (parent instanceof UIForm) { + return parent; + } + parent = parent.getParent(); + } + } + return null; + } + + private String getServerSubmitFunction(UIComponent component) { + UIComponent form = getUIForm(component); + if (component != null && form != null) { + Map<String, Object> param = new HashMap<String, Object>(); + param.put(component.getClientId(), component.getClientId()); + + JSFunction submitFunction = new JSFunction("RichFaces.submitForm"); + submitFunction.addParameter(form.getClientId()); + submitFunction.addParameter(param); + + return submitFunction.toScript(); + } + + return ""; + } + + protected String getOnClickFunction(FacesContext facesContext, UIComponent component) { AbstractMenuItem menuItem = (AbstractMenuItem) component; String subminMode = resolveSubmitMode(menuItem); if (subminMode == null || MenuComponent.MODE_SERVER.equalsIgnoreCase(subminMode)) { - return "submit()"; + return getServerSubmitFunction(menuItem); } else if (MenuComponent.MODE_AJAX.equalsIgnoreCase(subminMode)) { - return getOnClick(FacesContext.getCurrentInstance(), menuItem); + return getOnClick(facesContext, menuItem); } else if (menuItem.isDisabled()) { return ""; } else if (MenuComponent.MODE_CLIENT.equalsIgnoreCase(subminMode)) { @@ -92,9 +126,9 @@ return MenuComponent.MODE_SERVER; } - protected String getStyleClass(UIComponent component, String ddMenuStyle, String menuGroupStyle, String menuItemStyle) { - UIComponent ddMenu = getDDMenu(component); - UIComponent menuGroup = getMenuGroup(component); + protected String getStyleClass(FacesContext facesContext, UIComponent component, String ddMenuStyle, String menuGroupStyle, String menuItemStyle) { + UIComponent ddMenu = getDDMenu(facesContext, component); + UIComponent menuGroup = getMenuGroup(facesContext, component); Object styleClass = null; if (ddMenu != null && ddMenuStyle != null && ddMenuStyle.length() > 0) { styleClass = ddMenu.getAttributes().get(ddMenuStyle); @@ -106,7 +140,13 @@ return concatClasses(styleClass, component.getAttributes().get(menuItemStyle)); } - protected UIComponent getDDMenu(UIComponent component) { + /** + * Returns a parent <code>AbstractDropDownMenu</code> object of the given component. + * @param facesContext + * @param component + * @return <code>UIComponent</code> + */ + protected UIComponent getDDMenu(FacesContext facesContext, UIComponent component) { UIComponent parent = component.getParent(); while (parent != null) { if (parent instanceof AbstractDropDownMenu) { @@ -117,7 +157,13 @@ return null; } - protected UIComponent getMenuGroup(UIComponent component) { + /** + * Returns a parent <code>AbstractMenuGroup</code> object of the given component. + * @param facesContext + * @param component + * @return <code>UIComponent</code> + */ + protected UIComponent getMenuGroup(FacesContext facesContext, UIComponent component) { UIComponent parent = component.getParent(); while (parent != null) { if (parent instanceof AbstractMenuGroup) { Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/dropdownmenu.template.xml =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/dropdownmenu.template.xml 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/dropdownmenu.template.xml 2010-12-02 18:06:35 UTC (rev 20317) @@ -18,8 +18,8 @@ <cdk:object name="style" value="#{component.attributes['style']}" /> <cdk:object name="styleClass" value="#{not empty component.attributes['styleClass'] ? component.attributes['styleClass']:''}" /> - <cdk:object name="label" value="#{getLabelFacet(component)}" type="javax.faces.component.UIComponent" /> - <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(component)}" /> + <cdk:object name="label" value="#{getLabelFacet(facesContext, component)}" type="javax.faces.component.UIComponent" /> + <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(facesContext, component)}" /> <div id="#{clientId}" class="rf-ddm-lbl #{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-unsel '+styleClass} " style="#{style}" cdk:passThroughWithExclusions=""> @@ -39,7 +39,7 @@ </div> <div class="rf-ddm-pos"> - <div id="#{clientId}_list" class="rf-ddm-lst" style="display:none;"> + <div id="#{clientId}_list" class="rf-ddm-lst" style="display:none;min-width:#{getMinPopupWidth(facesContext, component)}px;"> <div class="rf-ddm-lst-bg"> <cdk:body /> </div> @@ -47,11 +47,11 @@ </div> <script type="text/javascript"> <cdk:scriptObject name="options"> - <cdk:scriptOption attributes="hideDelay showDelay" /> - <cdk:scriptOption attributes="onshow onhide ongroupshow ongrouphide" wrapper="eventHandler"/> + <cdk:scriptOption attributes="hideDelay showDelay popupWith jointPoint direction mode" /> + <cdk:scriptOption attributes="onshow onhide ongroupshow ongrouphide onitemclick" wrapper="eventHandler"/> </cdk:scriptObject> - new RichFaces.ui.Menu("#{clientId}",#{toScriptArgs(options)}).initiateGroups(#{toScriptArgs(getMenuGroups(facesContext, component))}); + new RichFaces.ui.Menu(#{toScriptArgs(clientId, options)}).initiateGroups(#{toScriptArgs(getMenuGroups(facesContext, component))}); </script> </div> </cc:implementation> Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml 2010-12-02 18:06:35 UTC (rev 20317) @@ -18,13 +18,13 @@ <cdk:object name="style" value="#{component.attributes['style']}" /> <cdk:object name="iconClass" value="#{component.attributes['iconClass']}" /> <cdk:object name="labelClass" value="#{component.attributes['labelClass']}" /> - <cdk:object name="styleClass" type="java.lang.String" value="#{getStyleClass(component, 'groupClass', 'styleClass')}" /> - <cdk:object name="selectedClass" type="java.lang.String" value="#{getStyleClass(component, 'selectedGroupClass', 'selectedClass')}" /> - <cdk:object name="disabledClass" type="java.lang.String" value="#{getStyleClass(component, 'disabledGroupClass', 'disabledClass')}" /> + <cdk:object name="styleClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'groupClass', 'styleClass')}" /> + <cdk:object name="selectedClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'selectedGroupClass', 'selectedClass')}" /> + <cdk:object name="disabledClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'disabledGroupClass', 'disabledClass')}" /> - <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(component)}" /> - <cdk:object name="iconFacet" value="#{getIconFacet(component)}" type="javax.faces.component.UIComponent" /> - <cdk:object name="iconAttribute" value="#{getIconAttribute(component)}" type="java.lang.String" /> + <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(facesContext, component)}" /> + <cdk:object name="iconFacet" value="#{getIconFacet(facesContext, component)}" type="javax.faces.component.UIComponent" /> + <cdk:object name="iconAttribute" value="#{getIconAttribute(facesContext, component)}" type="java.lang.String" /> <cdk:object name="onmouseover" type="java.lang.String" value="this.className='rf-ddm-itm rf-ddm-itm-sel #{selectedClass}'" /> <cdk:object name="onmouseout" type="java.lang.String" value="this.className='rf-ddm-itm rf-ddm-itm-unsel'" /> @@ -59,7 +59,7 @@ <div class="rf-ddm-nd"> <c:choose> <c:when test="#{not isDisabled}"> - <div id="#{clientId}_list" class="rf-ddm-lst rf-ddm-sublst" style="display:none;"> + <div id="#{clientId}_list" class="rf-ddm-lst rf-ddm-sublst" style="display:none;min-width:#{getMinPopupWidth(facesContext, component)}px;"> <div class="rf-ddm-lst-bg"> <cdk:call expression="renderChildren(facesContext, component)" /> </div> Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml 2010-12-02 18:04:58 UTC (rev 20316) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml 2010-12-02 18:06:35 UTC (rev 20317) @@ -12,27 +12,31 @@ <cdk:component-family>org.richfaces.DropDownMenu</cdk:component-family> <cdk:renderer-type>org.richfaces.MenuItemRenderer</cdk:renderer-type> <cdk:renders-children>true</cdk:renders-children> + + <cdk:resource-dependency name="dropdownmenu.ecss" library="org.richfaces" /> + <cdk:resource-dependency name="ajax.reslib" library="org.richfaces" /> + <cdk:resource-dependency name="base-component.reslib" library="org.richfaces" /> </cc:interface> <cc:implementation> <cdk:object name="style" value="#{component.attributes['style']}" /> - <cdk:object name="iconClass" type="java.lang.String" value="#{getStyleClass(component, '', 'iconClass', 'iconClass')}" /> - <cdk:object name="labelClass" type="java.lang.String" value="#{getStyleClass(component, '', 'labelClass', 'labelClass')}" /> - <cdk:object name="styleClass" type="java.lang.String" value="#{getStyleClass(component, 'itemClass', 'styleClass', 'styleClass')}" /> - <cdk:object name="selectedClass" type="java.lang.String" value="#{getStyleClass(component, 'selectedItemClass', 'selectedClass', 'selectedClass')}" /> - <cdk:object name="disabledClass" type="java.lang.String" value="#{getStyleClass(component, 'disabledItemClass', 'disabledClass', 'disabledClass')}" /> + <cdk:object name="iconClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, '', 'iconClass', 'iconClass')}" /> + <cdk:object name="labelClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, '', 'labelClass', 'labelClass')}" /> + <cdk:object name="styleClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'itemClass', 'styleClass', 'styleClass')}" /> + <cdk:object name="selectedClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'selectedItemClass', 'selectedClass', 'selectedClass')}" /> + <cdk:object name="disabledClass" type="java.lang.String" value="#{getStyleClass(facesContext, component, 'disabledItemClass', 'disabledClass', 'disabledClass')}" /> - <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(component)}" /> + <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(facesContext, component)}" /> <cdk:object name="onmouseover" type="java.lang.String" value="this.className='rf-ddm-itm rf-ddm-itm-sel #{selectedClass}'" /> <cdk:object name="onmouseout" type="java.lang.String" value="this.className='rf-ddm-itm rf-ddm-itm-unsel #{styleClass}'" /> - <cdk:object name="iconFacet" value="#{getIconFacet(component)}" type="javax.faces.component.UIComponent" /> - <cdk:object name="iconAttribute" value="#{getIconAttribute(component)}" type="java.lang.String" /> + <cdk:object name="iconFacet" value="#{getIconFacet(facesContext, component)}" type="javax.faces.component.UIComponent" /> + <cdk:object name="iconAttribute" value="#{getIconAttribute(facesContext, component)}" type="java.lang.String" /> <div id="#{clientId}" class="rf-ddm-itm #{isDisabled ? 'rf-ddm-itm-dis '+disabledClass : 'rf-ddm-itm-unsel '+styleClass}" style="#{style}" onmouseover="#{isDisabled ? '' : onmouseover}" onmouseout="#{isDisabled ? '' : onmouseout}" - onclick="#{getOnClickFunction(component)}" + onclick="#{getOnClickFunction(facesContext, component)}" cdk:passThroughWithExclusions=""> <span class="rf-ddm-itm-ic #{iconClass}"> <c:choose>