[richfaces-svn-commits] JBoss Rich Faces SVN: r11815 - trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: pyaschenko
Date: 2008-12-16 10:12:09 -0500 (Tue, 16 Dec 2008)
New Revision: 11815

Modified:
   trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
https://jira.jboss.org/jira/browse/RF-3426

Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2008-12-16 14:45:20 UTC (rev 11814)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2008-12-16 15:12:09 UTC (rev 11815)
@@ -76,19 +76,19 @@
 	queuedId : '',
 
 
-	LMPopUp:function(menuName, isCurrent) {
+	LMPopUp:function(menuName, isCurrent, event) {
 		if (!this.loaded || ( this.isVisible(menuName) && !isCurrent)) {
 			return;
 		}
 		if (menuName == this.father[this.layerPoppedUp]) {
-			this.LMPopUpL(this.layerPoppedUp, false);
+			this.LMPopUpL(this.layerPoppedUp, false, event);
 		} else if (this.father[menuName] == this.layerPoppedUp) {
-			this.LMPopUpL(menuName, true);
+			this.LMPopUpL(menuName, true, event);
 		} else {
 			//this.shutdown();
 			foobar = menuName;
 			do {
-				this.LMPopUpL(foobar, true);
+				this.LMPopUpL(foobar, true, event);
 				foobar = this.father[foobar];
 			} while (foobar);
 		}
@@ -103,7 +103,7 @@
 	 *	@param menuName
 	 *	@param visibleFlag
 	 */
-	LMPopUpL: function(menuName, visibleFlag) {
+	LMPopUpL: function(menuName, visibleFlag, event) {
 		if (!this.loaded) {
 			return;
 		}
@@ -118,10 +118,10 @@
 		if (visible && !visibleFlag) {
 			if (menuLayer) {
 				if (menuLayer.eventOnClose) {
-					menuLayer.eventOnClose();
+					menuLayer.eventOnClose(event);
 				}
 				if (menuLayer.eventOnCollapse) {
-					menuLayer.eventOnCollapse();
+					menuLayer.eventOnCollapse(event);
 				}
 				if (menuLayer.refItem) {
 					menuLayer.refItem.highLightGroup(false);
@@ -130,10 +130,10 @@
 		} else if (!visible && visibleFlag) {
 			if (menuLayer) {
 				if (menuLayer.eventOnOpen) {
-					menuLayer.eventOnOpen();
+					menuLayer.eventOnOpen(event);
 				}
 				if (menuLayer.eventOnExpand) {
-					menuLayer.eventOnExpand();
+					menuLayer.eventOnExpand(event);
 				}
 	
 				if (menuLayer.level>0) {
@@ -142,7 +142,7 @@
 					} while (menuLayer.level > 0);
 					
 					if (menuLayer && menuLayer.eventOnGroupActivate) { 
-						menuLayer.eventOnGroupActivate();
+						menuLayer.eventOnGroupActivate(event);
 					}
 				}
 			}
@@ -431,7 +431,7 @@
 		this.layer.style.display=layer_display;
 		this.layer.style.visibility='';
 		
-        RichFaces.Menu.Layers.LMPopUp(this.layer.id, false);
+        RichFaces.Menu.Layers.LMPopUp(this.layer.id, false,e);
         RichFaces.Menu.Layers.clearLMTO();
     }.bind(this);
 }
@@ -1052,7 +1052,7 @@
 	hideMe: function(e){
 		RichFaces.Menu.Layers.clearPopUpTO();
 		RichFaces.Menu.Layers.levels[this.level] = null;
-		RichFaces.Menu.Layers.LMPopUpL(this.id, false);
+		RichFaces.Menu.Layers.LMPopUpL(this.id, false,e);
 //		if (this.eventOnClose) this.eventOnClose();
 	},
 	asDropDown: function(topLevel, bindElementId, onEvt, offEvt, options){