Ticket #6112: 6112.patch

_base/focus.js

@@ -182 +182 @@
                         targetWindow = window;
                 }
 
-                dojo.connect(targetWindow.document, "onmousedown", null, function(evt){
-                        dijit._justMouseDowned = true;
-                        setTimeout(function(){ dijit._justMouseDowned = false; }, 0);
-                        dijit._onTouchNode(evt.target||evt.srcElement);
+                dojo.connect(targetWindow.document, "onmousedown", function(evt){
+                    var n=evt.target||evt.srcElement;
+                    //Do not try to set focus to a node in an editor iframe if the window already has focus, see #6112
+                    if(targetWindow['__isEditorFrame'] && dijit._curFocus && dijit._curFocus.nodeName=='IFRAME' &&
+                        dijit._curFocus.contentWindow===targetWindow ){
+                        return;
+                    }
+                    dijit._justMouseDowned = true;
+                    setTimeout(function(){ dijit._justMouseDowned = false; }, 0);
+                    dijit._onTouchNode(n);
                 });
                 //dojo.connect(targetWindow, "onscroll", ???);
 

_editor/RichText.js

@@ -646 +646 @@
                 this.isLoaded = true;
                 if(!this.window.__registeredWindow){
                         this.window.__registeredWindow=true;
+                        if(dojo.isIE){
+                            this.window.__isEditorFrame=true;
+                        }
                         dijit.registerWin(this.window);
                 }
                 if(!dojo.isIE && (this.height || dojo.isMoz)){