Author: abelevich Date: 2007-11-13 11:21:43 -0500 (Tue, 13 Nov 2007) New Revision: 3952 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx Log: RF-1336, RF-1307 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-13 16:21:22 UTC (rev 3951) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-13 16:21:43 UTC (rev 3952) @@ -134,16 +134,32 @@ UIPanelMenu parentMenu = findMenu(item); if (!parentMenu.isDisabled() && !item.isDisabled()) { if (calculateLevel(item) == 0) { - classBuffer.append(parentMenu.getTopItemClass()).append(" "); + String topItemClass = parentMenu.getTopItemClass(); + if(topItemClass != null && !topItemClass.equals("")){ + classBuffer.append(topItemClass).append(" "); + } classBuffer.append("rich-pmenu-top-item "); - } else - classBuffer.append(parentMenu.getItemClass() + " "); + } else { + String parentItemClass = parentMenu.getItemClass(); + if(parentItemClass != null && !parentItemClass.equals("")){ + classBuffer.append(parentItemClass).append(" "); + } + } String itemClass = item.getStyleClass(); - if(itemClass != null){ + if(itemClass != null && !itemClass.equals("")){ classBuffer.append(itemClass); } - } else - classBuffer.append(parentMenu.getDisabledItemClass() + " ").append(item.getDisabledClass()); + } else { + String pmDisabledItemClass = parentMenu.getDisabledItemClass(); + if (pmDisabledItemClass != null && !pmDisabledItemClass.equals("")) { + classBuffer.append(pmDisabledItemClass).append(" "); + } + + String itemDisabledClass = item.getDisabledClass(); + if (itemDisabledClass != null && !itemDisabledClass.equals("")) { + classBuffer.append(itemDisabledClass); + } + } return classBuffer.toString(); } @@ -152,14 +168,32 @@ UIPanelMenuItem item = (UIPanelMenuItem)component; UIPanelMenu parentMenu = findMenu(item); if (!item.isDisabled()) { - if (calculateLevel(item) == 0) - styleBuffer.append(parentMenu.getTopItemStyle() + "; "); - else - styleBuffer.append(parentMenu.getItemStyle() + "; "); - styleBuffer.append(item.getStyle()); - } else - styleBuffer.append(parentMenu.getDisabledItemStyle() + "; ") - .append(item.getDisabledStyle()); + if (calculateLevel(item) == 0){ + String topItemStyle = parentMenu.getTopItemStyle(); + if (topItemStyle != null && !topItemStyle.equals("")) { + styleBuffer.append(parentMenu.getTopItemStyle()).append(";").append(" ");; + } + } else { + String itemStyle = parentMenu.getItemStyle(); + if (itemStyle != null && !itemStyle.equals("")) { + styleBuffer.append(itemStyle).append(";").append(" "); + } + } + String style = item.getStyle(); + if (style != null && !style.equals("")) { + styleBuffer.append(item.getStyle()); + } + } else { + String pmDisabledItemStyle = parentMenu.getDisabledItemStyle(); + if (pmDisabledItemStyle != null && !pmDisabledItemStyle.equals("")) { + styleBuffer.append(pmDisabledItemStyle).append(";").append(" ");; + } + + String itemDisabledStyle = item.getDisabledStyle(); + if (itemDisabledStyle != null && !itemDisabledStyle.equals("")){ + styleBuffer.append(itemDisabledStyle); + } + } return styleBuffer.toString(); } @@ -167,13 +201,14 @@ StringBuffer resClass = new StringBuffer(); UIPanelMenuItem item = (UIPanelMenuItem)component; UIPanelMenu parentMenu = findMenu(item); - if(!item.isDisabled() && !parentMenu.isDisabled()){ - if(isTopLevel(component)){ + if (!item.isDisabled() && !parentMenu.isDisabled()) { + if (isTopLevel(component)) { resClass.append("rich-pmenu-item-label rich-pmenu-top-item-label"); - - } else resClass.append("rich-pmenu-item-label"); + } else { + resClass.append("rich-pmenu-item-label"); + } } - if(isSelected(context, component)){ + 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/htmlPanelMenu.jspx =================================================================== --- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-11-13 16:21:22 UTC (rev 3951) +++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-11-13 16:21:43 UTC (rev 3952) @@ -23,10 +23,22 @@ /org/richfaces/renderkit/html/scripts/panelMenu.js, </h:scripts> - <f:clientid var="clientId"/> + <f:clientid var="clientId"/> + + <jsp:scriptlet> + <![CDATA[ + String style = component.getStyle(); + style = (style != null && !style.equals("")) ? style.trim() : ""; + if(!style.equals("") && !style.endsWith(";")){ + style = style + ";"; + } + variables.setVariable("style", style); + ]]> + </jsp:scriptlet> + <f:call name="utils.encodeBeginFormIfNessesary"/> - <div style="width:#{component.width}; #{component.style};" class="#{component.styleClass}" + <div style="width:#{component.width}; #{style}" class="#{component.styleClass}" id="#{clientId}" onclick="#{component.onclick}" ondblclick="#{component.ondblclick}"