[richfaces-svn-commits] JBoss Rich Faces SVN: r16280 - branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html.
Author: konstantin.mishin
Date: 2010-01-13 13:34:23 -0500 (Wed, 13 Jan 2010)
New Revision: 16280
Modified:
branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
Log:
RFPL-230
porting RF-7203 to enterprise branch
Modified:
branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
---
branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-01-13
18:28:37 UTC (rev 16279)
+++
branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-01-13
18:34:23 UTC (rev 16280)
@@ -40,6 +40,7 @@
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.ComponentVariables;
import org.ajax4jsf.renderkit.ComponentsVariableResolver;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.MenuComponent;
import org.richfaces.component.UIMenuItem;
import org.richfaces.component.util.ViewUtil;
@@ -222,8 +223,18 @@
scriptValue.append("RichFaces.Menu.updateItem(event,this");
scriptValue.append(attrStr);
scriptValue.append(");");
- scriptValue.append(AjaxRendererUtils.buildOnClick(
- menuItem, context).toString());
+ String event = null;
+ Object onclick = menuItem.getAttributes().get(HTML.onclick_ATTRIBUTE);
+ if (onclick != null && onclick.toString().length()>0) {
+ event = HTML.onclick_ATTRIBUTE;
+ } else {
+ Object onselect = menuItem.getAttributes().get(HTML.onselect_ATTRIBUTE);
+ if (onselect != null && onselect.toString().length()>0) {
+ event = HTML.onselect_ATTRIBUTE;
+ }
+ }
+ scriptValue.append(AjaxRendererUtils.buildOnEvent(menuItem, context,
event).toString());
+ menuItem.getAttributes().put(HTML.onselect_ATTRIBUTE, null);
} else if (MenuComponent.MODE_SERVER.equalsIgnoreCase(mode)) {
/*