Ticket #6112: 6112_focus.patch

_editor/RichText.js

@@ -324 +324 @@
                 }
 
                 this.isClosed = false;
-                // Safari's selections go all out of whack if we do it inline,
-                // so for now IE is our only hero
-                //if(typeof dojo.doc.body.contentEditable != "undefined"){
+
                 if(dojo.isIE || dojo.isSafari || dojo.isOpera){ // contentEditable, easy
                         var ifr = this.iframe = dojo.doc.createElement('iframe');
                         ifr.id=this.id;
@@ -377 +375 @@
 
         _getIframeDocTxt: function(/* String */ html){
                 var _cs = dojo.getComputedStyle(this.domNode);
-                if(dojo.isIE || (!this.height && !dojo.isMoz)){
+                if(!this.height && !dojo.isMoz){
                         html="<div style='height:100%;'>"+html+"</div>";
                 }
                 var font = [ _cs.fontWeight, _cs.fontSize, _cs.fontFamily ].join(" ");
@@ -648 +646 @@
                         this.window.__registeredWindow=true;
                         dijit.registerWin(this.window);
                 }
-                if(!dojo.isIE && (this.height || dojo.isMoz)){
+                if(this.height || dojo.isMoz){
                         this.editNode=this.document.body;
                 }else{
                         this.editNode=this.document.body.firstChild;
-                        var _this = this;
-                        if(dojo.isIE){ // #4996 IE wants to focus the BODY tag
-                                this.editNode.parentNode.onfocus =
-                                        function(){
-                                                if(!_this.editNode.blurring){
-                                                        _this.editNode.focus();
-                                                }
-                                                _this.editNode.blurring = false;
-                                        }
+                        if(dojo.isIE && !this.height){ // #4996 IE wants to focus the BODY tag when it should focus
+                            var _this = this; 
+                            this.editNode.parentNode.onfocus = function(){ 
+                                if(!_this.editNode.blurring){ 
+                                    _this.editNode.focus(); 
+                                }
+                                _this.editNode.blurring = false; 
+                            }
                         }
                 }
 
@@ -713 +710 @@
                 // keyPress events can be emulated by the keyDown and keyUp detection.
                 if(dojo.isIE){
                         if(e.keyCode == dojo.keys.TAB && e.shiftKey && !e.ctrlKey && !e.altKey){
-                                // focus the BODY so the browser will tab away from it instead
+                                // focus the documentElement so the browser will tab away from it instead
                                 this.editNode.blurring = true;
-                                this.editNode.parentNode.focus();
+                                this.editNode.blur();
+                                this.document.documentElement.focus();
                         }else if(e.keyCode === dojo.keys.BACKSPACE && this.document.selection.type === "Control"){
                                 // IE has a bug where if a non-text object is selected in the editor,
                   // hitting backspace would act as if the browser's back button was
@@ -833 +831 @@
         // TODO: why is this needed - should we deprecate this ?
         blur: function(){
                 // summary: remove focus from this instance
-                if(!dojo.isIE && this.window.document.documentElement && this.window.document.documentElement.focus){
-                        this.window.document.documentElement.focus();
+                if(!dojo.isIE && this.document.documentElement && this.document.documentElement.focus){
+                        this.document.documentElement.focus();
                 }else if(dojo.doc.body.focus){
                         dojo.doc.body.focus();
                 }