Author: pyaschenko Date: 2011-02-18 10:35:56 -0500 (Fri, 18 Feb 2011) New Revision: 21769 Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js Log: https://jira.jboss.org/browse/RF-10563 Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-02-18 15:23:46 UTC (rev 21768) +++ trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-02-18 15:35:56 UTC (rev 21769) @@ -49,7 +49,7 @@ itemDisabledLeftIcon="triangleLeft" topItemDisabledLeftIcon="triangleUp" topItemLeftIcon="triangleDown" - groupMode="server" activeItem="item41" + groupMode="client" activeItem="item41" bubbleSelection="true" expandSingle="true"> <rich:panelMenuGroup id="group1" label="Group 1" selectable="true" @@ -62,9 +62,10 @@ onswitch="alert('onswitch')" onbeforeswitch="alert('onbeforeswitch')"> <rich:panelMenuItem id="item11" label="Item 1.1" - onbeforeselect="alert('onbeforeselect')" - onselect="alert('onselectItem')"/> - <rich:panelMenuItem id="item12" label="Item 1.2" /> + onbeforeselect="alert('onbeforeselect-Item')" + onselect="alert('onselect-Item')"/> + <rich:panelMenuItem id="item12" label="Item 1.2" + rightIcon="chevron" rightIconClass="rightIconClass" leftIconClass="aaaa"/> </rich:panelMenuGroup> <rich:panelMenuItem id="item2" label="Item 2" disabled="true" /> <rich:panelMenuItem id="item3" label="Item 3" /> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-18 15:23:46 UTC (rev 21768) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-18 15:35:56 UTC (rev 21769) @@ -67,6 +67,7 @@ public static final String BEFORE_COLLAPSE = "beforecollapse"; public static final String BEFORE_EXPAND = "beforeexpand"; public static final String BEFORE_SWITCH = "beforeswitch"; + public static final String BEFORE_SELECT = "beforeselect"; public static final String SELECT = "select"; private static final String CSS_CLASS_PREFIX = "rf-pm-gr"; @@ -211,6 +212,7 @@ addEventOption(context, panelMenuGroup, options, BEFORE_COLLAPSE); addEventOption(context, panelMenuGroup, options, BEFORE_EXPAND); addEventOption(context, panelMenuGroup, options, BEFORE_SWITCH); + addEventOption(context, panelMenuGroup, options, BEFORE_SELECT); addEventOption(context, panelMenuGroup, options, SELECT); return options; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-18 15:23:46 UTC (rev 21768) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-18 15:35:56 UTC (rev 21769) @@ -189,6 +189,7 @@ }); this.__addUserEventHandler("select"); + this.__addUserEventHandler("beforeselect"); }, /***************************** Public Methods ****************************************************************/