Upgrade to ExtJS 3.1.0 - Released 12/16/2009

[extjs.git] / src / widgets / layout / TableLayout.js

diff --git a/src/widgets/layout/TableLayout.js b/src/widgets/layout/TableLayout.js
index 7e009ee..f5bdd37 100644 (file)
--- a/src/widgets/layout/TableLayout.js
+++ b/src/widgets/layout/TableLayout.js
@@ -1,5 +1,5 @@
 /*!
- * Ext JS Library 3.0.0
+ * Ext JS Library 3.1.0
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
@@ -72,6 +72,8 @@ Ext.layout.TableLayout = Ext.extend(Ext.layout.ContainerLayout, {
 \r
     // private\r
     monitorResize:false,\r
+    \r
+    targetCls: 'x-table-layout-ct',\r
 \r
     /**\r
      * @cfg {Object} tableAttrs\r
@@ -106,8 +108,6 @@ Ext.layout.TableLayout = Ext.extend(Ext.layout.ContainerLayout, {
         var cs = ct.items.items, len = cs.length, c, i;\r
 \r
         if(!this.table){\r
-            target.addClass('x-table-layout-ct');\r
-\r
             this.table = target.createChild(\r
                 Ext.apply({tag:'table', cls:'x-table-layout', cellspacing: 0, cn: {tag: 'tbody'}}, this.tableAttrs), null, true);\r
         }\r
@@ -173,16 +173,18 @@ Ext.layout.TableLayout = Ext.extend(Ext.layout.ContainerLayout, {
     renderItem : function(c, position, target){\r
         if(c && !c.rendered){\r
             c.render(this.getNextCell(c));\r
-            if(this.extraCls){\r
-                var t = c.getPositionEl ? c.getPositionEl() : c;\r
-                t.addClass(this.extraCls);\r
-            }\r
+            this.configureItem(c, position);\r
+        }else if(c && !this.isValidParent(c, target)){\r
+            var container = this.getNextCell(c);\r
+            container.insertBefore(c.getPositionEl().dom, null);\r
+            c.container = Ext.get(container);\r
+            this.configureItem(c, position);\r
         }\r
     },\r
 \r
     // private\r
     isValidParent : function(c, target){\r
-        return true;\r
+        return c.getPositionEl().up('table', 5).dom.parentNode === (target.dom || target);\r
     }\r
 \r
     /**\r