Changeset 14417

Timestamp:

07/14/08 00:58:52 (12 months ago)

Author:

bill

Message:

Inline Editor markup into mail.html, rather than creating it programatically, after race condition fix for iframe initialization on FF2.
The code for iframe initialization is pretty messy in that it has separate paths for IE/FF (only FF2 calls _drawIFrame()), and should be cleaned up at some point.
Fixes #7097 !strict.

Location:

dijit/trunk

Files:

• demos/mail.html (modified) (2 diffs)
• _editor/RichText.js (modified) (3 diffs)

dijit/trunk/demos/mail.html

@@ -230 +230 @@
 
                         <!-- new message part -->
-                        <!-- : editor will be created programmically to avoid init issues -->
-                        
+                        <div dojoType="dijit.Editor" region="center" style="overflow:auto"
+        extraPlugins="['createLink','insertImage',{name:'dijit._editor.plugins.FontChoice', command: 'fontName', generic: true},'fontSize']"
+
+>
+<i> This is just a sample message. There is email-address auto-complete in the to: field.
+<br><br> give it a whirl.
+</i>
+</div>
                         <div dojoType="dijit.layout.ContentPane" region="bottom" style="height:32px" align="center">
                                 <button dojoType="dijit.form.Button" iconClass="mailIconOk"
@@ -288 +294 @@
                                         tabs.addChild(newTab);
                                         tabs.selectChild(newTab);
-                                        newTab.containerNode.appendChild(document.createElement('div'));
-                                        newTab.containerNode.lastChild.innerHTML='<i> This is just a sample message. There is email-address auto-complete in the to: field.<br><br> give it a whirl.</i>';
-                                        var editor = new dijit.Editor({
-                                                 extraPlugins: ['createLink','insertImage',{name:'dijit._editor.plugins.FontChoice', command: 'fontName', generic: true},'fontSize'],
-                                                 region:'center',
-                                                 height:'100%'
-                                                 },newTab.containerNode.lastChild);
-                                        if(editor.iframe){
-                                                //if iframe is used, don't use addChild otherwise the editor is not working properly because
-                                                //addChild will re-attach the editor to the document DOM, instead use this hack
-                                                newTab._setupChild(editor);
-                                                setTimeout(dojo.hitch(newTab,'layout'),0)
-                                        }else{
-                                                newTab.addChild(editor);
-                                        }
                                 </script>
                         </button>

dijit/trunk/_editor/RichText.js

@@ -214 +214 @@
 
 
-                // 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();
-                contentDoc.write(this._getIframeDocTxt(html));
-                contentDoc.close();
 
                 // now we wait for onload. Janky hack!
@@ -234 +227 @@
                                         }else if(this.iframe.contentDocument){
                                                 // for opera
+                                                // TODO: this method is only being called for FF2; can we remove this?
                                                 this.window = this.iframe.contentDocument.window;
                                                 this.document = this.iframe.contentDocument;
@@ -245 +239 @@
                                         return;
                                 }
+
+                                // 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.document;
+                                contentDoc.open();
+                                contentDoc.write(this._getIframeDocTxt(html));
+                                contentDoc.close();
 
                                 dojo._destroyElement(tmpContent);