Upgrade to ExtJS 4.0.2 - Released 06/09/2011

[extjs.git] / src / layout / container / Accordion.js

diff --git a/src/layout/container/Accordion.js b/src/layout/container/Accordion.js
index ada861d..ed867c8 100644 (file)
--- a/src/layout/container/Accordion.js
+++ b/src/layout/container/Accordion.js
@@ -1,3 +1,17 @@
+/*
+
+This file is part of Ext JS 4
+
+Copyright (c) 2011 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file.  Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
+
+*/

 /**
  * @class Ext.layout.container.Accordion
  * @extends Ext.layout.container.VBox
 /**
  * @class Ext.layout.container.Accordion
  * @extends Ext.layout.container.VBox


@@ -40,7 +54,7 @@ Ext.define('Ext.layout.container.Accordion', {
     extend: 'Ext.layout.container.VBox',
     alias: ['layout.accordion'],
     alternateClassName: 'Ext.layout.AccordionLayout',
     extend: 'Ext.layout.container.VBox',
     alias: ['layout.accordion'],
     alternateClassName: 'Ext.layout.AccordionLayout',

-    
+

     align: 'stretch',
 
     /**
     align: 'stretch',
 
     /**


@@ -118,7 +132,7 @@ Ext.define('Ext.layout.container.Accordion', {
 
         me.callParent(arguments);
         if (me.fill) {
 
         me.callParent(arguments);
         if (me.fill) {

-            if (!me.owner.el.dom.style.height) {
+            if (!me.owner.el.dom.style.height || !me.getLayoutTargetSize().height) {

                 return false;
             }
         } else {
                 return false;
             }
         } else {


@@ -157,7 +171,6 @@ Ext.define('Ext.layout.container.Accordion', {
                 delete comp.hideHeader;
                 comp.collapsible = true;
                 comp.title = comp.title || ' ';
                 delete comp.hideHeader;
                 comp.collapsible = true;
                 comp.title = comp.title || ' ';

-                comp.setBorder(false);

 
                 // Set initial sizes
                 comp.width = targetSize.width;
 
                 // Set initial sizes
                 comp.width = targetSize.width;


@@ -170,12 +183,19 @@ Ext.define('Ext.layout.container.Accordion', {
                         comp.collapsed = true;
                     }
                     // Otherwise expand the first item with collapsed explicitly configured as false
                         comp.collapsed = true;
                     }
                     // Otherwise expand the first item with collapsed explicitly configured as false

-                    else if (comp.collapsed === false) {
+                    else if (comp.hasOwnProperty('collapsed') && comp.collapsed === false) {

                         comp.flex = 1;
                         me.expandedItem = i;
                     } else {
                         comp.collapsed = true;
                     }
                         comp.flex = 1;
                         me.expandedItem = i;
                     } else {
                         comp.collapsed = true;
                     }

+                    // If we are fitting, then intercept expand/collapse requests.
+                    me.owner.mon(comp, {
+                        show: me.onComponentShow,
+                        beforeexpand: me.onComponentExpand,
+                        beforecollapse: me.onComponentCollapse,
+                        scope: me
+                    });

                 } else {
                     delete comp.flex;
                     comp.animCollapse = me.initialAnimate;
                 } else {
                     delete comp.flex;
                     comp.animCollapse = me.initialAnimate;


@@ -194,10 +214,10 @@ Ext.define('Ext.layout.container.Accordion', {
                 comp.flex = 1;
             }
         }
                 comp.flex = 1;
             }
         }

-        
+

         // Render all Panels.
         me.callParent(arguments);
         // Render all Panels.
         me.callParent(arguments);

-                
+

         // Postprocess rendered Panels.
         ln = renderedPanels.length;
         for (i = 0; i < ln; i++) {
         // Postprocess rendered Panels.
         ln = renderedPanels.length;
         for (i = 0; i < ln; i++) {


@@ -208,24 +228,13 @@ Ext.define('Ext.layout.container.Accordion', {
 
             comp.header.addCls(Ext.baseCSSPrefix + 'accordion-hd');
             comp.body.addCls(Ext.baseCSSPrefix + 'accordion-body');
 
             comp.header.addCls(Ext.baseCSSPrefix + 'accordion-hd');
             comp.body.addCls(Ext.baseCSSPrefix + 'accordion-body');

-            
-            // If we are fitting, then intercept expand/collapse requests. 
-            if (me.fill) {
-                me.owner.mon(comp, {
-                    show: me.onComponentShow,
-                    beforeexpand: me.onComponentExpand,
-                    beforecollapse: me.onComponentCollapse,
-                    scope: me
-                });
-            }

         }
     },
 
     onLayout: function() {
         var me = this;
         }
     },
 
     onLayout: function() {
         var me = this;

-        
-        me.updatePanelClasses();
-                
+
+

         if (me.fill) {
             me.callParent(arguments);
         } else {
         if (me.fill) {
             me.callParent(arguments);
         } else {


@@ -243,24 +252,27 @@ Ext.define('Ext.layout.container.Accordion', {
                 }
             }
         }
                 }
             }
         }

-        
+        me.updatePanelClasses();
+

         return me;
     },
         return me;
     },

-    
+

     updatePanelClasses: function() {
         var children = this.getLayoutItems(),
             ln = children.length,
             siblingCollapsed = true,
             i, child;
     updatePanelClasses: function() {
         var children = this.getLayoutItems(),
             ln = children.length,
             siblingCollapsed = true,
             i, child;

-            
+

         for (i = 0; i < ln; i++) {
             child = children[i];
         for (i = 0; i < ln; i++) {
             child = children[i];

-            if (!siblingCollapsed) {
-                child.header.addCls(Ext.baseCSSPrefix + 'accordion-hd-sibling-expanded');
+
+            if (siblingCollapsed) {
+                child.header.removeCls(Ext.baseCSSPrefix + 'accordion-hd-sibling-expanded');

             }
             else {
             }
             else {

-                child.header.removeCls(Ext.baseCSSPrefix + 'accordion-hd-sibling-expanded');
+                child.header.addCls(Ext.baseCSSPrefix + 'accordion-hd-sibling-expanded');

             }
             }

+

             if (i + 1 == ln && child.collapsed) {
                 child.header.addCls(Ext.baseCSSPrefix + 'accordion-hd-last-collapsed');
             }
             if (i + 1 == ln && child.collapsed) {
                 child.header.addCls(Ext.baseCSSPrefix + 'accordion-hd-last-collapsed');
             }


@@ -289,7 +301,7 @@ Ext.define('Ext.layout.container.Accordion', {
                 me.setCollapsed(comp);
             }
         }
                 me.setCollapsed(comp);
             }
         }

-        
+

         me.animate = me.initialAnimate;
         me.layout();
         me.animate = false;
         me.animate = me.initialAnimate;
         me.layout();
         me.animate = false;


@@ -311,7 +323,7 @@ Ext.define('Ext.layout.container.Accordion', {
             if (expanded.length === 1 && expanded[0] === comp) {
                 me.setExpanded(toExpand);
             }
             if (expanded.length === 1 && expanded[0] === comp) {
                 me.setExpanded(toExpand);
             }

-            
+

             me.animate = me.initialAnimate;
             me.layout();
             me.animate = false;
             me.animate = me.initialAnimate;
             me.layout();
             me.animate = false;


@@ -382,4 +394,4 @@ Ext.define('Ext.layout.container.Accordion', {
         }
         comp.setAutoScroll(comp.initialConfig.autoScroll);
     }
         }
         comp.setAutoScroll(comp.initialConfig.autoScroll);
     }

-});
\ No newline at end of file
+});