Upgrade to ExtJS 3.3.1 - Released 11/30/2010

[extjs.git] / src / widgets / menu / MenuMgr.js

diff --git a/src/widgets/menu/MenuMgr.js b/src/widgets/menu/MenuMgr.js
index e9a5e88..57ac169 100644 (file)
--- a/src/widgets/menu/MenuMgr.js
+++ b/src/widgets/menu/MenuMgr.js
@@ -1,8 +1,8 @@
 /*!
 /*!

- * Ext JS Library 3.0.3
- * Copyright(c) 2006-2009 Ext JS, LLC
- * licensing@extjs.com
- * http://www.extjs.com/license
+ * Ext JS Library 3.3.1
+ * Copyright(c) 2006-2010 Sencha Inc.
+ * licensing@sencha.com
+ * http://www.sencha.com/license

  */
 /**
  * @class Ext.menu.MenuMgr
  */
 /**
  * @class Ext.menu.MenuMgr


@@ -30,7 +30,9 @@ Ext.menu.MenuMgr = function(){
            c.each(function(m){
                m.hide();
            });
            c.each(function(m){
                m.hide();
            });

+           return true;

        }
        }

+       return false;

    }
 
    // private
    }
 
    // private


@@ -54,7 +56,7 @@ Ext.menu.MenuMgr = function(){
        if(m.parentMenu){
           m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"), 10) + 3);
           m.parentMenu.activeChild = m;
        if(m.parentMenu){
           m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"), 10) + 3);
           m.parentMenu.activeChild = m;

-       }else if(last && last.isVisible()){
+       }else if(last && !last.isDestroyed && last.isVisible()){

           m.getEl().setZIndex(parseInt(last.getEl().getStyle("z-index"), 10) + 3);
        }
    }
           m.getEl().setZIndex(parseInt(last.getEl().getStyle("z-index"), 10) + 3);
        }
    }


@@ -87,25 +89,14 @@ Ext.menu.MenuMgr = function(){
        }
    }
 
        }
    }
 

-   // private
-   function onBeforeCheck(mi, state){
-       if(state){
-           var g = groups[mi.group];
-           for(var i = 0, l = g.length; i < l; i++){
-               if(g[i] != mi){
-                   g[i].setChecked(false);
-               }
-           }
-       }
-   }
-

    return {
 
        /**
         * Hides all menus that are currently visible
    return {
 
        /**
         * Hides all menus that are currently visible

+        * @return {Boolean} success True if any active menus were hidden.

         */
        hideAll : function(){
         */
        hideAll : function(){

-            hideAll();  
+            return hideAll();

        },
 
        // private
        },
 
        // private


@@ -114,18 +105,12 @@ Ext.menu.MenuMgr = function(){
                init();
            }
            menus[menu.id] = menu;
                init();
            }
            menus[menu.id] = menu;

-           menu.on("beforehide", onBeforeHide);
-           menu.on("hide", onHide);
-           menu.on("beforeshow", onBeforeShow);
-           menu.on("show", onShow);
-           var g = menu.group;
-           if(g && menu.events["checkchange"]){
-               if(!groups[g]){
-                   groups[g] = [];
-               }
-               groups[g].push(menu);
-               menu.on("checkchange", onCheck);
-           }
+           menu.on({
+               beforehide: onBeforeHide,
+               hide: onHide,
+               beforeshow: onBeforeShow,
+               show: onShow
+           });

        },
 
         /**
        },
 
         /**


@@ -156,11 +141,6 @@ Ext.menu.MenuMgr = function(){
            menu.un("hide", onHide);
            menu.un("beforeshow", onBeforeShow);
            menu.un("show", onShow);
            menu.un("hide", onHide);
            menu.un("beforeshow", onBeforeShow);
            menu.un("show", onShow);

-           var g = menu.group;
-           if(g && menu.events["checkchange"]){
-               groups[g].remove(menu);
-               menu.un("checkchange", onCheck);
-           }

        },
 
        // private
        },
 
        // private


@@ -171,7 +151,6 @@ Ext.menu.MenuMgr = function(){
                    groups[g] = [];
                }
                groups[g].push(menuItem);
                    groups[g] = [];
                }
                groups[g].push(menuItem);

-               menuItem.on("beforecheckchange", onBeforeCheck);

            }
        },
 
            }
        },
 


@@ -180,7 +159,23 @@ Ext.menu.MenuMgr = function(){
            var g = menuItem.group;
            if(g){
                groups[g].remove(menuItem);
            var g = menuItem.group;
            if(g){
                groups[g].remove(menuItem);

-               menuItem.un("beforecheckchange", onBeforeCheck);
+           }
+       },
+       
+       // private
+       onCheckChange: function(item, state){
+           if(item.group && state){
+               var group = groups[item.group],
+                   i = 0,
+                   len = group.length,
+                   current;
+                   
+               for(; i < len; i++){
+                   current = group[i];
+                   if(current != item){
+                       current.setChecked(false);
+                   }
+               }

            }
        },
 
            }
        },