From f45e5af41d8d1146c6a192938519df3f91f2781e Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas.papon@webflows.fr>
Date: Fri, 6 Jan 2012 16:35:37 +0100
Subject: [PATCH] little fixed on ui menu and replaced the demo

---
 nav/menu/menu.html       | 33 +++++++++++++++++++++++++++++----
 nav/menu/menu.js         |  6 ++++--
 nav/menuable/menuable.js |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/nav/menu/menu.html b/nav/menu/menu.html
index 0b6e24e..0970ac9 100644
--- a/nav/menu/menu.html
+++ b/nav/menu/menu.html
@@ -21,6 +21,10 @@
 				padding:0.5em 1em;
 				cursor: pointer;
 			}
+      #menu2{
+        relative: absolute;
+        top: 200px;
+      }
 		</style>
 	</head>
 	<body>
@@ -50,6 +54,7 @@ <h1>Menu</h1>
             
             </li>
         </ul>
+
         <ul id='menu2'>
             <li>A
                 <ul>
@@ -81,14 +86,34 @@ <h1>Menu</h1>
             </li>
         </ul>
 
-		<script type='text/javascript' 
+		<script type='text/javascript'
                 src='../../../steal/steal.js'>   
         </script>
         <script type='text/javascript'>
             steal('mxui/nav/menu').then(function(){
-				$("#menu1").mxui_nav_menu();
-            	$("#menu2").mxui_ui_menu().show().trigger("move", {top: 60, left: 280});
-			});
+				      $("#menu1").mxui_nav_menu();
+
+              Mxui.UI.Menu.extend("Enhanced.UI.menu", {},
+                {
+                "mouseleave": function(el,e){
+                  if(this.options.level == 0){
+                    this.element.children('.'+this.options.select).trigger('deactivate')
+                  }
+                },
+                ">show" : function(el, ev){
+                   if(ev.target == this.element[0]){
+                    this.element.show();
+                    // prevent the event to trigger the positionable "show" handler
+                    ev.stopPropagation()
+                    this.element.children('.'+this.options.active+":first").trigger('deactivate')
+                   }
+                }
+
+              })
+
+            	$("#menu2").enhanced_ui_menu().show()
+
+      			});
         </script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/nav/menu/menu.js b/nav/menu/menu.js
index 5f216b9..52d940b 100644
--- a/nav/menu/menu.js
+++ b/nav/menu/menu.js
@@ -111,7 +111,9 @@ steal('mxui/layout/positionable','mxui/nav/menuable','jquery/event/hover').then(
 		">show" : function(el, ev){
 		   if(ev.target == this.element[0]){
 				this.element.show();
-		   }
+        // prevent the event to trigger the positionable "show" handler
+        ev.stopPropagation()
+		 }
 			
 		}
    });
@@ -145,7 +147,7 @@ steal('mxui/layout/positionable','mxui/nav/menuable','jquery/event/hover').then(
     */
    Mxui.Nav.Menu.extend("Mxui.UI.Menu",{
    		defaults: {
-			types : [Mxui.Layout.Positionable("Mxui.UI.TopLeft",{defaults: {my: "left top",at: "right top"}},{}), 
+			types : [Mxui.Layout.Positionable("Mxui.UI.TopLeft",{defaults: {my: "left top",at: "right top", keep:true}},{}),
 					 Mxui.UI.Highlight],
 			select_event : "hoverenter",
 			child_selector : "li",
diff --git a/nav/menuable/menuable.js b/nav/menuable/menuable.js
index e07616b..d0e594a 100644
--- a/nav/menuable/menuable.js
+++ b/nav/menuable/menuable.js
@@ -59,7 +59,7 @@ steal('jquery/controller',
 			if(this.activating)
 				return;
 			this.activating = true;
-			var options = this.options, oldActive = this.find("."+options.active+":first"), self= this;
+			var options = this.options, oldActive = this.element.children("."+options.active+":first"), self= this;
 			
 			ev.pause();
 			var doThis = function(){
