Changeset 15173

Timestamp:

09/08/08 07:08:51 (10 months ago)

Author:

doughays

Message:

Fixes #7614. References #7097. Remerge Editor change from [14417].

Files:

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

dijit/trunk/_editor/RichText.js

@@ -548 +548 @@
                 var _iframeInitialized = false;
                 // console.debug(this.iframe);
-                // var contentDoc = this.iframe.contentWindow.document;
-
 
                 // note that on Safari lower than 420+, we have to get the iframe
                 // by ID in order to get something w/ a contentDocument property
-
-                var contentDoc = this.iframe.contentDocument;
-                contentDoc.open();
-                if(dojo.isAIR){
-                        contentDoc.body.innerHTML = html;
-                }else{
-                        contentDoc.write(this._getIframeDocTxt(html));
-                }
-                contentDoc.close();
 
                 // now we wait for onload. Janky hack!
@@ -586 +575 @@
                                         return;
                                 }
+
+                                var contentDoc = this.document;
+                                        contentDoc.open();
+                                if(dojo.isAIR){
+                                        contentDoc.body.innerHTML = html;
+                                }else{
+                                        contentDoc.write(this._getIframeDocTxt(html));
+                                }
+                                contentDoc.close();
 
                                 dojo._destroyElement(tmpContent);