[richfaces-svn-commits] JBoss Rich Faces SVN: r244 - trunk/richfaces/menu-components/src/main/templates/org/richfaces.

[richfaces-svn-commits at lists.jboss.org]

Author: F.antonov
Date: 2007-04-03 09:48:54 -0400 (Tue, 03 Apr 2007)
New Revision: 244

Modified:
   trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
Log:
MenuItem component development.

Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx	2007-04-03 12:51:47 UTC (rev 243)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx	2007-04-03 13:48:54 UTC (rev 244)
@@ -14,7 +14,7 @@
    	<h:scripts>
 			new org.ajax4jsf.framework.resource.PrototypeScript(),
 			new org.ajax4jsf.framework.ajax.AjaxScript(),
-			new org.ajax4jsf.framework.util.command.CommandScript(),
+			new org.ajax4jsf.framework.util.command.CommandScript()
 	</h:scripts>
 	
 	<f:call name="initializeResources" />
@@ -25,11 +25,20 @@
 		onmouseout="#{onmouseout}"
 		onmouseover="#{onmouseover}"
 		style="#{component.attributes['style']}"
-		onclick="#{onclick}"		
-		>
-				
+		onclick="#{onclick}">		
+		<jsp:scriptlet><![CDATA[
+			if (!((org.richfaces.component.UIMenuItem) component).isDisabled()) {
+		]]></jsp:scriptlet>		
+		<f:call name="utils.encodeAttributes">
+			<f:parameter value="onmousedown,onmouseup,onmousemove" />
+		</f:call>
+		<jsp:scriptlet><![CDATA[
+			}
+		]]></jsp:scriptlet>
+		
 		<span id="#{clientId}:icon" 
-			class="#{iconClass}">
+			class="#{iconClass}"
+			style="#{component.attributes['iconStyle']}">
 			<jsp:scriptlet><![CDATA[
 				UIComponent iconFacet = getIconFacet((org.richfaces.component.UIMenuItem) component);			
 				if (null != iconFacet) {
@@ -37,8 +46,7 @@
 				} else {
 			]]></jsp:scriptlet>
 			<img width="16" 
-				height="16" 
-				style="#{component.attributes['iconStyle']}"
+				height="16"				
 				src="#{icon}" />
 			<jsp:scriptlet><![CDATA[
 				}