Changeset 12747

Timestamp:

02/27/08 15:29:13 (6 months ago)

Author:

doughays

Message:

Fixes #5968. On IE, the focus was being set to each Editor as it was rendered which was trumping the focusOnLoad. I made each editor temporarily unselectable in IE which prevented incorrect focusing. This also fixes the onChange problem in IE were the first onChange did not fire because the automatic focus was not detected by the widget.

Location:

dijit/trunk

Files:

• tests/test_Editor.html (modified) (1 diff)
• _editor/RichText.js (modified) (2 diffs)

dijit/trunk/tests/test_Editor.html

@@ -64 +64 @@
         <h2>Created from div</h2>
         <div style="border: 1px solid black;">
-                <div dojoType="dijit.Editor" id="editor1"><p>This instance is created from a div directly with default toolbar and plugins</p></div>
+                <div dojoType="dijit.Editor" id="editor1"
+                        onChange="console.log('user onChange handler: ' + arguments[0])"
+                ><p>This instance is created from a div directly with default toolbar and plugins</p></div>
         </div>
         <button onClick="dijit.byId('editor1').destroy()">destroy</button>

dijit/trunk/_editor/RichText.js

@@ -611 +611 @@
         setDisabled: function(/*Boolean*/ disabled){
                 if(dojo.isIE || dojo.isSafari || dojo.isOpera){
-                        this.editNode.contentEditable=!disabled;
+                        if(dojo.isIE){ this.editNode.unselectable = "on"; } // prevent IE from setting focus
+                        this.editNode.contentEditable=!disabled;
+                        if(dojo.isIE){
+                                var _this = this;
+                                setTimeout(function(){ _this.editNode.unselectable = "off"; }, 0);
+                        }
                 }else{ //moz
                         if(disabled){
@@ -680 +685 @@
 
                 if(this.focusOnLoad){
-                        this.focus();
+                        setTimeout(dojo.hitch(this, "focus"), 0); // have to wait for IE to set unselectable=off
                 }