Author: sergeyhalipov Date: 2007-09-17 10:13:13 -0400 (Mon, 17 Sep 2007) New Revision: 2957 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js Log: http://jira.jboss.com/jira/browse/RF-900 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-09-17 14:00:29 UTC (rev 2956) +++ trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-09-17 14:13:13 UTC (rev 2957) @@ -208,21 +208,19 @@ trigger: function(e){ if ("none" == this.mode) return; -// if (this.action !="panelMenuItemAction"){ - if (this.action){ - this.preTrigger(e); - var form = Event.findElement(e, "form"); - if ("server" == this.mode) { - if (this.target) - form.target = this.target; - form.submit(); - } - else if ("ajax" == this.mode) { - var event = e; - eval(this.ajaxSubmit); - } - this.postTrigger(e); + + this.preTrigger(e); + var form = Event.findElement(e, "form"); + if ("server" == this.mode) { + if (this.target) + form.target = this.target; + form.submit(); } + else if ("ajax" == this.mode) { + var event = e; + eval(this.ajaxSubmit); + } + this.postTrigger(e); }, itemClicked: function(e){ @@ -271,9 +269,7 @@ this.collapse(); } } - if (this.action){ - this.trigger(e); - } + this.trigger(e); } else { if (this.parentObj.expandSingle){ if (this.parentObj.lastExpanded!=null){ @@ -294,9 +290,7 @@ this.expand(); } } - if (this.action){ - this.trigger(e); - } + this.trigger(e); } } }