Author: abelevich
Date: 2008-08-29 05:18:46 -0400 (Fri, 29 Aug 2008)
New Revision: 10230
Modified:
trunk/ui/toolBar/src/main/config/component/toolBar.xml
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-4312
Modified: trunk/ui/toolBar/src/main/config/component/toolBar.xml
===================================================================
--- trunk/ui/toolBar/src/main/config/component/toolBar.xml 2008-08-29 08:40:36 UTC (rev
10229)
+++ trunk/ui/toolBar/src/main/config/component/toolBar.xml 2008-08-29 09:18:46 UTC (rev
10230)
@@ -206,5 +206,56 @@
&ui_component_attributes;
&html_style_attributes;
&html_events;
+
+ <property>
+ <name>onitemkeydown</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is pressed down on an
item</description>
+ </property>
+ <property>
+ <name>onitemkeypress</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is pressed and released on an
item</description>
+ </property>
+ <property>
+ <name>onitemkeyup</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is released on an
item</description>
+ </property>
+ <property>
+ <name>onitemclick</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer button is clicked on an
item</description>
+ </property>
+ <property>
+ <name>onitemdblclick</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer button is double-clicked on
an item</description>
+ </property>
+ <property>
+ <name>onitemmousedown</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; a pointer button is pressed down on an
item</description>
+ </property>
+ <property>
+ <name>onitemmousemove</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved on an
item</description>
+ </property>
+ <property>
+ <name>onitemmouseover</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved onto an
item</description>
+ </property>
+ <property>
+ <name>onitemmouseout</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved away from an
item</description>
+ </property>
+ <property>
+ <name>onitemmouseup</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; a pointer button is released on an
item</description>
+ </property>
</component>
</components>
\ No newline at end of file
Modified:
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
===================================================================
---
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-08-29
08:40:36 UTC (rev 10229)
+++
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-08-29
09:18:46 UTC (rev 10230)
@@ -195,22 +195,16 @@
protected void encodeEventsAttributes(FacesContext facesContext, UIComponent component,
ResponseWriter writer)
throws IOException {
- UIToolBar toolbar = getParentToolBar(component);
- Map<String, Object> attributes = toolbar.getAttributes();
- Map<String, Object> groupAttributes = component.getAttributes();
-
+ Map<String, Object> attributes = component.getAttributes();
for (int i = 0; i < ON_ITEM_EVENTS.length; i++) {
- String eventName = ON_ITEM_EVENTS[i].replace("item", "");
- Object value = attributes.get(ON_ITEM_EVENTS[i]);
- Object groupValue = groupAttributes.get(eventName);
- String attrvalue = "";
+ String eventName = ON_ITEM_EVENTS[i];
+ Object value = null;
+ value = attributes.get(eventName);
+ String attrvalue = "";
if ((null != value && !"".equals(value))) {
attrvalue = attrvalue + value;
}
- if ((null != groupValue && !"".equals(groupValue))) {
- attrvalue = attrvalue + ";" + groupValue;
- }
- getUtils().writeAttribute(writer, eventName, attrvalue);
+ getUtils().writeAttribute(writer, eventName.replace("item",""),
attrvalue);
}
}