Upgrade to ExtJS 3.2.0 - Released 03/30/2010

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

diff --git a/src/widgets/menu/Menu.js b/src/widgets/menu/Menu.js
index ddf0e84..3915d60 100644 (file)
--- a/src/widgets/menu/Menu.js
+++ b/src/widgets/menu/Menu.js
@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.1.1
- * Copyright(c) 2006-2010 Ext JS, LLC
+ * Ext JS Library 3.2.0
+ * Copyright(c) 2006-2010 Ext JS, Inc.
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -433,6 +433,10 @@ Ext.menu.Menu = Ext.extend(Ext.Container, {
         }else{
             max = this.getHeight();
         }
+        // Always respect maxHeight 
+        if (this.maxHeight){
+            max = Math.min(this.maxHeight, max);
+        }
         if(full > max && max > 0){
             this.activeMax = max - this.scrollerHeight * 2 - this.el.getFrameWidth('tb') - Ext.num(this.el.shadowOffset, 0);
             this.ul.setHeight(this.activeMax);