Ticket #6759: multipledialog.patch

Users/bgibson/Documents/workspace/trunk/dijit/Dialog.js

@@ -25 +25 @@
                         // summary: Append the underlay to the body
                         dojo.body().appendChild(this.domNode);
                         this.bgIframe = new dijit.BackgroundIframe(this.domNode);
+                        this._modalConnect = null;
                 },
 
                 layout: function(){
@@ -58 +59 @@
                         if(this.bgIframe.iframe){
                                 this.bgIframe.iframe.style.display = "block";
                         }
+                        this._modalConnect = dojo.connect(this.domNode, "onmousedown", this, "_onMouseDown");
                 },
 
                 hide: function(){
@@ -66 +68 @@
                         if(this.bgIframe.iframe){
                                 this.bgIframe.iframe.style.display = "none";
                         }
+                        dojo.disconnect(this._modalConnect);
+                        this._modalConnect = null;
+                },
+                
+                _onMouseDown: function(/*Event*/ evt){
+                        dojo.stopEvent(evt);
+                        window.focus();
+                        
                 },
 
                 uninitialize: function(){
@@ -353 +363 @@
 
                         this._modalconnects.push(dojo.connect(window, "onscroll", this, "layout"));
                         this._modalconnects.push(dojo.connect(window, "onresize", this, "layout"));
-                        this._modalconnects.push(dojo.connect(dojo.doc.documentElement, "onkeypress", this, "_onKey"));
+                        this._modalconnects.push(dojo.connect(this.domNode, "onkeypress", this, "_onKey"));
+
 
                         dojo.style(this.domNode, {
                                 opacity:0,
@@ -368 +379 @@
                         this._fadeIn.play();
 
                         this._savedFocus = dijit.getFocus(this);
-
+        
                         // find focusable Items each time dialog is shown since if dialog contains a widget the 
                         // first focusable items can change
                         this._getFocusItems(this.domNode);