[richfaces-svn-commits] JBoss Rich Faces SVN: r947 - in trunk/richfaces/panelmenu/src/main: templates/org/richfaces and 1 other directory.

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

Author: dbiatenia
Date: 2007-05-30 10:15:53 -0400 (Wed, 30 May 2007)
New Revision: 947

Modified:
   trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
   trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
Log:
execute action for items bugfix

Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
===================================================================
--- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js	2007-05-30 12:30:28 UTC (rev 946)
+++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js	2007-05-30 14:15:53 UTC (rev 947)
@@ -211,9 +211,7 @@
 							this.collapse();
 						} 
 					}
-					if (this.action){
-						this.trigger(e);
-					}
+					this.trigger(e);
 				} else { 
 					if (this.parentObj.expandSingle){
 						if (this.parentObj.lastExpanded!=null){
@@ -224,9 +222,7 @@
 								this.expand();
 							} 
 						}
-						if (this.action){
-							this.trigger(e);
-						}
+						this.trigger(e);
 						this.parentObj.lastExpanded = this;
 					} else {
 						if ("node" == this.type){
@@ -234,11 +230,11 @@
 								this.expand();
 							} 
 						}
-						if (this.action){
-							this.trigger(e);
-						}
+						this.trigger(e);
 					}
 				}
+			} else {
+				this.trigger(e);
 			}
 		} else {
 			if (this.expanded){

Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
===================================================================
--- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx	2007-05-30 12:30:28 UTC (rev 946)
+++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx	2007-05-30 14:15:53 UTC (rev 947)
@@ -21,8 +21,8 @@
                       if (component.isDisabled() || findMenu(component).isDisabled()) {
 						variables.setVariable("itemClass", itemClass);
                       } else {
-                      	onClick = component.getAttributes().get("onclick") + ";" + getOnClick(context, component);
-                      	variables.setVariable("onClick", onClick);
+                      	//onClick = component.getAttributes().get("onclick") + ";" + getOnClick(context, component);
+                      	//variables.setVariable("onClick", onClick);
                       }
                       
                   ]]>
@@ -30,9 +30,10 @@
 			<table cellpadding="0" cellspacing="0" border="0" width="100%"
 					class="rich-pmenu-item dr-pmenu-item #{this:getFullStyleClass( context, component )} #{itemClass}"
 					style="#{this:getFullStyle( context, component )}"
+					
 					id="tablehide#{clientId}" >
 				<f:call name="utils.encodeAttributes">
-					<f:parameter value="onmousedown,onmouseup,onmousemove" />
+					<f:parameter value="onclick,onmousedown,onmouseup,onmousemove" />
 				</f:call>
 				<tr>
 					<f:call name="utils.encodeId"/>