allow string based values for comboboxarray

[roojs1] / Roo / bootstrap / MenuMgr.js

diff --git a/Roo/bootstrap/MenuMgr.js b/Roo/bootstrap/MenuMgr.js
index a2e0979..09970bc 100644 (file)
--- a/Roo/bootstrap/MenuMgr.js
+++ b/Roo/bootstrap/MenuMgr.js
@@ -42,7 +42,7 @@ Roo.bootstrap.MenuMgr = function(){
    function onHide(m){
        active.remove(m);
        if(active.length < 1){
-           Roo.get(document).un("mousedown", onMouseDown);
+           Roo.get(document).un("mouseup", onMouseDown);
             
            attached = false;
        }
@@ -54,12 +54,12 @@ Roo.bootstrap.MenuMgr = function(){
        lastShow = new Date();
        active.add(m);
        if(!attached){
-           Roo.get(document).on("mousedown", onMouseDown);
+          Roo.get(document).on("mouseup", onMouseDown);
            
            attached = true;
        }
        if(m.parentMenu){
-          m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"), 10) + 3);
+          //m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"), 10) + 3);
           m.parentMenu.activeChild = m;
        }else if(last && last.isVisible()){
           //m.getEl().setZIndex(parseInt(last.getEl().getStyle("z-index"), 10) + 3);
@@ -87,12 +87,17 @@ Roo.bootstrap.MenuMgr = function(){
        }
    }
 
-   // private
+   // private this should really trigger on mouseup..
    function onMouseDown(e){
-        //Roo.log("on MouseDown");
-       if(lastShow.getElapsed() > 50 && active.length > 0 && !e.getTarget(".x-menu")){
-           hideAll();
-       }
+        Roo.log("on Mouse Up");
+        
+        if(lastShow.getElapsed() > 50 && active.length > 0 && !e.getTarget(".dropdown-menu") && !e.getTarget('.user-menu')){
+            Roo.log("MenuManager hideAll");
+            hideAll();
+            e.stopEvent();
+        }
+        
+        
    }
 
    // private