Changeset 12068

Timestamp:

01/17/08 09:50:40 (12 months ago)

Author:

dante

Message:

fixes #5351 - modal connects not being disconnected in a lot of destroy/hide combinations.
accomodates focus state, but simply destroy's the underlay and bgiframe etc.

Location:

dijit/trunk

Files:

• Dialog.js (modified) (4 diffs)
• tests/test_Dialog_focusDestroy.html (modified) (2 diffs)

dijit/trunk/Dialog.js

@@ -149 +149 @@
                         this.connect(this, "onExecute", "hide");
                         this.connect(this, "onCancel", "hide");
+                        this._modalconnects = [];       
                 },
 
@@ -162 +163 @@
                         //              time (but we defer it until right beforehand, for
                         //              performance reasons)
-
-                        this._modalconnects = [];
 
                         if(this.titleBar){
@@ -282 +281 @@
                         // summary: display the dialog
 
+                        if(this.open){ return; }
+                        
                         // first time we show the dialog, there's some initialization stuff to do                       
                         if(!this._alreadyInitialized){
@@ -347 +348 @@
                                 this._position();
                         }
+                },
+                
+                destroy: function(){
+                        dojo.forEach(this._modalconnects, dojo.disconnect);
+                        if(this.open){
+                                var fo = this._savedFocus;
+                                setTimeout(dojo.hitch(dijit,"focus",fo),25);
+                        }
+                        this.inherited(arguments);                      
                 }
         }

dijit/trunk/tests/test_Dialog_focusDestroy.html

@@ -28 +28 @@
 
                         var input = document.createElement("input");
-                        dojo.attr(input,"tabIndex","1");
+                        dojo.attr(input,"tabIndex","0");
                         dlg.containerNode.appendChild(input);
 
@@ -37 +37 @@
                                 console.log("destroying, while visible"); 
                                 dlg.destroy();
+                                
                         });
                         dlg.show();