Changeset 12160

Timestamp:

01/24/08 21:05:28 (6 months ago)

Author:

bill

Message:

Fixes #5648:

• child widget not started after parent.refresh() or setHref() call
  
• top level ContentPane? will pass bogus size argument to child.resize() (but works if ContentPane? is child of a layout container)
  
  

Also has the start of some code to control when ContentPane? acts (or doesn't act) as a layout container, sizing it's child widget.

Files:

• dijit/trunk/layout/ContentPane.js (modified) (3 diffs)

dijit/trunk/layout/ContentPane.js

@@ -72 +72 @@
         // class: String
         //      Class name to apply to ContentPane dom nodes
+        // TODO: this should be called "baseClass" like in the other widgets
         "class": "dijitContentPane",
+
+        // layout: String/Boolean
+        //      false - don't adjust size of children
+        //      true - looks for the first sizable child widget (ie, having resize() method) and sets it's size to
+        //                      however big the ContentPane is
+        //      auto - if there is a single sizable child widget (ie, having resize() method), set it's size to
+        //                      however big the ContentPane is
+        doLayout: "auto",
 
         postCreate: function(){
@@ -106 +115 @@
                 //      Test if we have exactly one widget as a child, and if so assume that we are a container for that widget,
                 //      and should propogate startup() and resize() calls to it.
+
+                // TODO: if there are two child widgets (a data store and a TabContainer, for example),
+                //      should still find the TabContainer
                 var childNodes = dojo.query(">", this.containerNode || this.domNode),
                         childWidgets = childNodes.filter("[widgetId]");
@@ -162 +174 @@
                 }
 
-                this._checkIfSingleChild();
-                if(this._singleChild && this._singleChild.resize){
-                        this._singleChild.resize(this._contentBox);
-                }
+//              if(this.doLayout != "false" && this.doLayout !== false){
+                        this._checkIfSingleChild();
+                        console.log("singlechild " , this._singleChild, " my content box is ", this._contentBox);
+                        if(this._singleChild && this._singleChild.resize){
+                                this._singleChild.startup();
+                                this._singleChild.resize(this._contentBox || dojo.contentBox(this.containerNode || this.domNode));
+                        }
+//              }
 
                 this._onLoadHandler();