Changeset 12161

Timestamp:

01/25/08 01:07:09 (7 months ago)

Author:

bill

Message:

Fixes #5669: Dialog can't contain layout widgets.
Modifies Dialog to initialize in a visibility:hidden state rather than display:none, in order for possible child layout widgets to initialize correctly.
As Dialog is not a layout widget itself, note that this means that the child layout widgets must have a size specified (rather than specifying a size on the Dialog itself)

Location:

dijit/trunk

Files:

• Dialog.js (modified) (5 diffs)
• layout/ContentPane.js (modified) (4 diffs)
• tests/test_Dialog.html (modified) (2 diffs)

dijit/trunk/Dialog.js

@@ -144 +144 @@
                 _lastFocusItem:null,
 
+                // doLayout: Boolean
+                //              Don't change this parameter from the default value.
+                //              This ContentPane parameter doesn't make sense for Dialog, since Dialog
+                //              is never a child of a layout Container, nor can you specify the size of
+                //              Dialog in order to control the size of an inner widget. 
+                doLayout: false,
+
                 attributeMap: dojo.mixin(dojo.clone(dijit._Widget.prototype.attributeMap),
                         {title: "titleBar"}),
@@ -150 +157 @@
                         dojo.body().appendChild(this.domNode);
                         this.inherited("postCreate",arguments);
-                        this.domNode.style.display="none";
+                        this.domNode.style.visibility="hidden";
                         this.connect(this, "onExecute", "hide");
                         this.connect(this, "onCancel", "hide");
@@ -204 +211 @@
                                         duration: this.duration,
                                         onEnd: function(){
-                                                node.style.display="none";
+                                                node.style.visibility="hidden";
                                         }
                                  }),
@@ -300 +307 @@
 
                         dojo.style(this.domNode, "opacity", 0);
-                        this.domNode.style.display="block";
+                        this.domNode.style.visibility="";
                         this.open = true;
                         this._loadCheck(); // lazy load trigger
@@ -343 +350 @@
                 layout: function() {
                         // summary: position the Dialog and the underlay
-                        if(this.domNode.style.display == "block"){
+                        if(this.domNode.style.visibility != "hidden"){
                                 this._underlay.layout();
                                 this._position();

dijit/trunk/layout/ContentPane.js

@@ -75 +75 @@
         "class": "dijitContentPane",
 
-        // layout: String/Boolean
+        // doLayout: 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
+        //                      however big the ContentPane is (TODO: implement)
         //      auto - if there is a single sizable child widget (ie, having resize() method), set it's size to
         //                      however big the ContentPane is
@@ -103 +103 @@
         startup: function(){
                 if(this._started){ return; }
-                this._checkIfSingleChild();
-                if(this._singleChild){
-                        this._singleChild.startup();
+                if(this.doLayout != "false" && this.doLayout !== false){
+                        this._checkIfSingleChild();
+                        if(this._singleChild){
+                                this._singleChild.startup();
+                        }
                 }
                 this._loadCheck();
@@ -174 +176 @@
                 }
 
-//              if(this.doLayout != "false" && this.doLayout !== false){
+                if(this.doLayout != "false" && this.doLayout !== false){
                         this._checkIfSingleChild();
                         console.log("singlechild " , this._singleChild, " my content box is ", this._contentBox);
@@ -181 +183 @@
                                 this._singleChild.resize(this._contentBox || dojo.contentBox(this.containerNode || this.domNode));
                         }
-//              }
+                }
 
                 this._onLoadHandler();

dijit/trunk/tests/test_Dialog.html

@@ -22 +22 @@
                 dojo.require("dijit.form.TimeTextBox");
                 dojo.require("dijit.form.FilteringSelect");
+                dojo.require("dijit.layout.TabContainer");
                 dojo.require("dijit.Menu");
                 dojo.require("dojo.parser");    // scan page for widgets and instantiate them                   
@@ -155 +156 @@
 </div>
 
+<button dojoType="dijit.form.Button" onclick="dijit.byId('tabDialog').show()">Show TabContainer Dialog</button> |
+
+<div dojoType="dijit.Dialog" id="tabDialog" title="TabContainer Dialog">
+        <div dojoType="dijit.layout.TabContainer" style="width: 400px; height: 400px;">
+                <div dojoType="dijit.layout.ContentPane" title="First tab">
+                        <p>
+                                This is the first tab.
+                        </p>
+                        <p>
+                        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+                        semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+                        porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+                        Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+                        Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+                        risus.
+                        </p>
+                </div>
+                <div dojoType="dijit.layout.ContentPane" title="Second tab">
+                        <p>
+                                This is the second tab.
+                        </p>
+                        <p>
+                        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+                        semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+                        porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+                        Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+                        Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+                        risus.
+                        </p>
+                </div>
+        </div>
+</div>
 
 <button dojoType="dijit.form.Button" onclick="dijit.byId('fifthDlg').show();">Test slow loading HREF Dialog</button>