Upgrade to ExtJS 3.2.0 - Released 03/30/2010

[extjs.git] / src / widgets / Container.js

diff --git a/src/widgets/Container.js b/src/widgets/Container.js
index d4e2da6..9afe314 100644 (file)
--- a/src/widgets/Container.js
+++ b/src/widgets/Container.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
  */
  * licensing@extjs.com
  * http://www.extjs.com/license
  */


@@ -276,7 +276,6 @@ layoutConfig: {
      * the frequency it calculates and does a re-layout of components. This is useful for heavy containers or containers
      * with a large quantity of sub-components for which frequent layout calls would be expensive. Defaults to <code>50</code>.
      */
      * the frequency it calculates and does a re-layout of components. This is useful for heavy containers or containers
      * with a large quantity of sub-components for which frequent layout calls would be expensive. Defaults to <code>50</code>.
      */

-    // Deprecated - will be removed in 3.2.x

     bufferResize: 50,
 
     /**
     bufferResize: 50,
 
     /**


@@ -441,8 +440,6 @@ items: [
             'remove'
         );
 
             'remove'
         );
 

-        this.enableBubble(this.bubbleEvents);
-

         /**
          * The collection of components in this container as a {@link Ext.util.MixedCollection}
          * @type MixedCollection
         /**
          * The collection of components in this container as a {@link Ext.util.MixedCollection}
          * @type MixedCollection


@@ -550,12 +547,10 @@ tb.{@link #doLayout}();             // refresh the layout
      * may not be removed or added.  See the Notes for {@link Ext.layout.BorderLayout BorderLayout}
      * for more details.</li>
      * </ul></div>
      * may not be removed or added.  See the Notes for {@link Ext.layout.BorderLayout BorderLayout}
      * for more details.</li>
      * </ul></div>

-     * @param {Object/Array} component
-     * <p>Either a single component or an Array of components to add.  See
+     * @param {...Object/Array} component
+     * <p>Either one or more Components to add or an Array of Components to add.  See

      * <code>{@link #items}</code> for additional information.</p>
      * <code>{@link #items}</code> for additional information.</p>

-     * @param {Object} (Optional) component_2
-     * @param {Object} (Optional) component_n
-     * @return {Ext.Component} component The Component (or config object) that was added.
+     * @return {Ext.Component/Array} The Components that were added.

      */
     add : function(comp){
         this.initItems();
      */
     add : function(comp){
         this.initItems();


@@ -761,11 +756,15 @@ tb.{@link #doLayout}();             // refresh the layout
 
     // private
     createComponent : function(config, defaultType){
 
     // private
     createComponent : function(config, defaultType){

+        if (config.render) {
+            return config;
+        }

         // add in ownerCt at creation time but then immediately
         // remove so that onBeforeAdd can handle it
         // add in ownerCt at creation time but then immediately
         // remove so that onBeforeAdd can handle it

-        var c = config.render ? config : Ext.create(Ext.apply({
+        var c = Ext.create(Ext.apply({

             ownerCt: this
         }, config), defaultType || this.defaultType);
             ownerCt: this
         }, config), defaultType || this.defaultType);

+        delete c.initialConfig.ownerCt;

         delete c.ownerCt;
         return c;
     },
         delete c.ownerCt;
         return c;
     },


@@ -871,7 +870,7 @@ tb.{@link #doLayout}();             // refresh the layout
      */
     getLayout : function(){
         if(!this.layout){
      */
     getLayout : function(){
         if(!this.layout){

-            var layout = new Ext.layout.ContainerLayout(this.layoutConfig);
+            var layout = new Ext.layout.AutoLayout(this.layoutConfig);

             this.setLayout(layout);
         }
         return this.layout;
             this.setLayout(layout);
         }
         return this.layout;