[richfaces-svn-commits] JBoss Rich Faces SVN: r3788 - in trunk/ui/panelmenu/src/main: templates/org/richfaces and 1 other directory.

Author: abelevich Date: 2007-11-06 07:12:12 -0500 (Tue, 06 Nov 2007) New Revision: 3788 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx Log: fix RF-1288 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-06 12:10:24 UTC (rev 3787) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-06 12:12:12 UTC (rev 3788) @@ -79,7 +79,7 @@ } if (align.equalsIgnoreCase(from)){ - image(context,component, from + "Icon" + component.getClientId(context), align); + image(context,component, from + "Icon" + component.getClientId(context)); } else { String iconType = PANEL_MENU_SPACER_ICON_NAME; String imageSrc = getIconByType(iconType, isTopLevel, context, component); @@ -87,7 +87,7 @@ } } - private void image(FacesContext context, UIComponent component, String id, String iconPos )throws IOException { + private void image(FacesContext context, UIComponent component, String id)throws IOException { ResponseWriter writer = context.getResponseWriter(); UIPanelMenu panelMenu = findMenu(component); @@ -242,7 +242,16 @@ return value; } - + + public String getSelectedClass(FacesContext context, UIComponent component){ + StringBuffer selectedClass = null; + if(isSelected(context, component)){ + selectedClass= new StringBuffer(); + selectedClass.append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS); + } + return selectedClass != null ? selectedClass.toString() : ""; + } + public String getLabelClass(FacesContext context, UIComponent component) { UIPanelMenuGroup group = (UIPanelMenuGroup)component; UIPanelMenu parentMenu = findMenu(group); @@ -252,9 +261,7 @@ resClass.append("rich-pmenu-group-self-label rich-pmenu-top-group-self-label"); } else resClass.append("rich-pmenu-group-self-label"); } - if(isSelected(context, component)){ - resClass.append(" ").append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS); - } + return resClass.toString(); } Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-06 12:10:24 UTC (rev 3787) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-06 12:12:12 UTC (rev 3788) @@ -27,7 +27,7 @@ <f:call name="utils.encodePassThru" /> - <tr> + <tr class="#{this:getSelectedClass( context, component )}"> <td class="dr-pmenu-nowrap #{this:getIconClass( context, component,'left')}"> <f:call name="insertSpacerImages" /> <f:call name="insertImage">