Changeset 12842

Timestamp:

03/03/08 13:29:43 (9 months ago)

Author:

doughays

Message:

Fixes #4996, #5835 !strict. IE wanted badly to focus the iframe's BODY tag on the way in and out. I added an onfocus handler for IE that just moved the focus either up or down another level to avoid stopping on the BODY tag. Also fixed a few code-style issues. becka11y verified correct behavior.

Files:

• dijit/trunk/_editor/RichText.js (modified) (13 diffs)

dijit/trunk/_editor/RichText.js

@@ -28 +28 @@
         }else{
                 //dojo.body() is not available before onLoad is fired
-                try {
+                try{
                         dojo.doc.write('<textarea id="' + dijit._scopeName + '._editor.RichText.savedContent" ' +
                                 'style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>');
@@ -329 +329 @@
                 // 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(typeof dojo.doc.body.contentEditable != "undefined"){
                 if(dojo.isIE || dojo.isSafari || dojo.isOpera){ // contentEditable, easy
                         var ifr = this.iframe = dojo.doc.createElement('iframe');
@@ -378 +378 @@
         _getIframeDocTxt: function(/* String */ html){
                 var _cs = dojo.getComputedStyle(this.domNode);
-                if(!this.height && !dojo.isMoz){
+                if(dojo.isIE || (!this.height && !dojo.isMoz)){
                         html="<div>"+html+"</div>";
                 }
@@ -648 +648 @@
                         dijit.registerWin(this.window);
                 }
-                if(this.height || dojo.isMoz){
+                if(!dojo.isIE && (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;
+                                        }
+                        }
                 }
 
@@ -681 +691 @@
                 }else{ // IE contentEditable
                         // give the node Layout on IE
+                        this.connect(this.document, "onmousedown", "_onMouseDown"); // #4996 fix focus
                         this.editNode.style.zoom = 1.0;
                 }
@@ -696 +707 @@
         onKeyDown: function(/* Event */ e){
                 // summary: Fired on keydown
-
-//               console.info("onkeydown:", e.keyCode);
 
                 // we need this event at the moment to get the events from control keys
@@ -703 +712 @@
                 // keyPress events can be emulated by the keyDown and keyUp detection.
                 if(dojo.isIE){
-                        if(e.keyCode === dojo.keys.BACKSPACE && this.document.selection.type === "Control"){
+                        if(e.keyCode == dojo.keys.TAB && e.shiftKey && !e.ctrlKey && !e.altKey){
+                                // focus the BODY so the browser will tab away from it instead
+                                this.editNode.blurring = true;
+                                this.editNode.parentNode.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
@@ -715 +728 @@
                                 this.onKeyPress(e);
                         }
-                }
-                else if(dojo.isMoz){
+                }else if(dojo.isMoz){
                         if(e.keyCode == dojo.keys.TAB && !e.shiftKey && !e.ctrlKey && !e.altKey && this.iframe){
                                 // update iframe document title for screen reader
@@ -725 +737 @@
                                 this.iframe.focus();  // this.focus(); won't work
                                 dojo.stopEvent(e);
-                        }else if (e.keyCode == dojo.keys.TAB && e.shiftKey){
+                        }else if(e.keyCode == dojo.keys.TAB && e.shiftKey){
                                 // if there is a toolbar, set focus to it, otherwise ignore
-                                if (this.toolbar){
+                                if(this.toolbar){
                                         this.toolbar.focus();
                                 }
@@ -745 +757 @@
         onKeyPress: function(e){
                 // summary: Fired on keypress
-
-//               console.info("onkeypress:", e.keyCode);
 
                 // handle the various key events
@@ -788 +798 @@
                 this.onDisplayChanged(e);
         },
+
+        _onMouseDown: function(/*Event*/e){ // IE only to prevent 2 clicks to focus
+                if(!this._focused && !this.disabled){
+                        this.focus();
+                }
+        },
+
         _onBlur: function(e){
                 this.inherited(arguments);
@@ -798 +815 @@
                         this.iframe.contentDocument.title = this._localizedIframeTitles.iframeEditTitle;
                 } 
-//                      console.info('_onBlur')
         },
         _initialFocus: true,
         _onFocus: function(/*Event*/e){
-//                      console.info('_onFocus')
                 // summary: Fired on focus
                 this.inherited(arguments);
@@ -1314 +1329 @@
 
                 // line height is squashed for iframes
-                // FIXME: why was this here? if (this.iframe){ this.domNode.style.lineHeight = null; }
+                // FIXME: why was this here? if(this.iframe){ this.domNode.style.lineHeight = null; }
 
                 if(this.interval){ clearInterval(this.interval); }