Changeset 13138

Timestamp:

03/18/08 17:51:26 (10 months ago)

Author:

alex

Message:

clean patch for #5617 that avoids timer for all but IE 6. Fixes #5617. !strict

Files:

• dijit/trunk/_editor/RichText.js (modified) (1 diff)
• dojo/trunk/resources/blank.html (modified) (1 diff)

dijit/trunk/_editor/RichText.js

@@ -330 +330 @@
                 //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;
-                        ifr.src = 'javascript:void(0)';
-                        this.editorObject = ifr;
+                        var burl = dojo.moduleUrl("dojo", "resources/blank.html")+"";
+                        var ifr = this.editorObject = this.iframe = dojo.doc.createElement('iframe');
+                        ifr.id = this.id+"_iframe";
+                        ifr.src = burl;
                         ifr.style.border = "none";
                         ifr.style.width = "100%";
                         ifr.frameBorder = 0;
-//                      ifr.style.scrolling = this.height ? "auto" : "vertical";
+                        // ifr.style.scrolling = this.height ? "auto" : "vertical";
                         this.editingArea.appendChild(ifr);
-                        this.window = ifr.contentWindow;
-                        this.document = this.window.document;
-                        this.document.open();
-                        this.document.write(this._getIframeDocTxt(html));
-                        this.document.close();
-
-                        if(dojo.isIE >= 7){
-                                if(this.height){
-                                        ifr.style.height = this.height;
+                        var h = null; // set later in non-ie6 branch
+                        var loadFunc = dojo.hitch( this, function(){
+                                if(h){ dojo.disconnect(h); h = null; }
+                                this.window = ifr.contentWindow;
+                                var d = this.document = this.window.document;
+                                d.open();
+                                d.write(this._getIframeDocTxt(html));
+                                d.close();
+
+                                if(dojo.isIE >= 7){
+                                        if(this.height){
+                                                ifr.style.height = this.height;
+                                        }
+                                        if(this.minHeight){
+                                                ifr.style.minHeight = this.minHeight;
+                                        }
+                                }else{
+                                        ifr.style.height = this.height ? this.height : this.minHeight;
                                 }
-                                if(this.minHeight){
-                                        ifr.style.minHeight = this.minHeight;
+
+                                if(dojo.isIE){
+                                        this._localizeEditorCommands();
                                 }
-                        }else{
-                                ifr.style.height = this.height ? this.height : this.minHeight;
-                        }
-
-                        if(dojo.isIE){
-                                this._localizeEditorCommands();
-                        }
-
-                        this.onLoad();
-                        this.savedContent = this.getValue(true);
+
+                                this.onLoad();
+                                this.savedContent = this.getValue(true);
+                        });
+                        if(dojo.isIE && dojo.isIE < 7){ // IE 6 is a steaming pile...
+                                var t = setInterval(function(){
+                                        if(ifr.contentWindow.isLoaded){
+                                                clearInterval(t);
+                                                loadFunc();
+                                        }
+                                }, 100);
+                        }else{ // blissful sanity!
+                                h = dojo.connect(
+                                        ((dojo.isIE) ? ifr.contentWindow : ifr), "onload", loadFunc
+                                );
+                        }
                 }else{ // designMode in iframe
                         this._drawIframe(html);

dojo/trunk/resources/blank.html

@@ -1 @@
-<html><head></head><body></body></html>
+<html><head><script>isLoaded = true;</script></head><body></body></html>