From richfaces-svn-commits at lists.jboss.org Wed May 30 10:15:53 2007
Content-Type: multipart/mixed; boundary="===============0287643367800431365=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r947 - in
 trunk/richfaces/panelmenu/src/main: templates/org/richfaces and 1 other
 directory.
Date: Wed, 30 May 2007 10:15:53 -0400
Message-ID: <E1HtOxt-0004fN-Od@committer01.frg.pub.inap.atl.jboss.com>

--===============0287643367800431365==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/htm=
l/scripts/panelMenu.js
   trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu=
Item.jspx
Log:
execute action for items bugfix

Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/render=
kit/html/scripts/panelMenu.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/ht=
ml/scripts/panelMenu.js	2007-05-30 12:30:28 UTC (rev 946)
+++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/ht=
ml/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!=3Dnull){
@@ -224,9 +222,7 @@
 								this.expand();
 							} =

 						}
-						if (this.action){
-							this.trigger(e);
-						}
+						this.trigger(e);
 						this.parentObj.lastExpanded =3D this;
 					} else {
 						if ("node" =3D=3D 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/htmlPa=
nelMenuItem.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMen=
uItem.jspx	2007-05-30 12:30:28 UTC (rev 946)
+++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMen=
uItem.jspx	2007-05-30 14:15:53 UTC (rev 947)
@@ -21,8 +21,8 @@
                       if (component.isDisabled() || findMenu(component).is=
Disabled()) {
 						variables.setVariable("itemClass", itemClass);
                       } else {
-                      	onClick =3D component.getAttributes().get("onclick"=
) + ";" + getOnClick(context, component);
-                      	variables.setVariable("onClick", onClick);
+                      	//onClick =3D component.getAttributes().get("onclic=
k") + ";" + getOnClick(context, component);
+                      	//variables.setVariable("onClick", onClick);
                       }
                       =

                   ]]>
@@ -30,9 +30,10 @@
 			<table cellpadding=3D"0" cellspacing=3D"0" border=3D"0" width=3D"100%"
 					class=3D"rich-pmenu-item dr-pmenu-item #{this:getFullStyleClass( cont=
ext, component )} #{itemClass}"
 					style=3D"#{this:getFullStyle( context, component )}"
+					=

 					id=3D"tablehide#{clientId}" >
 				<f:call name=3D"utils.encodeAttributes">
-					<f:parameter value=3D"onmousedown,onmouseup,onmousemove" />
+					<f:parameter value=3D"onclick,onmousedown,onmouseup,onmousemove" />
 				</f:call>
 				<tr>
 					<f:call name=3D"utils.encodeId"/>


--===============0287643367800431365==--