Changeset 6952

Timestamp:

12/30/06 07:49:04 (23 months ago)

Author:

jburke

Message:

Fixes #2247. RichText? can now work in xdomain loading

Location:

trunk

Files:

• src/widget/RichText.js (modified) (2 diffs)
• tests/widget/Editor/test_Editor2.html (modified) (1 diff)

trunk/src/widget/RichText.js

@@ -12 +12 @@
 
 // used to save content
-if(dojo.hostenv.post_load_){
-        (function(){
-                var savetextarea = dojo.doc().createElement('textarea');
-                savetextarea.id = "dojo.widget.RichText.savedContent";
-                savetextarea.style = "display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;";
-                dojo.body().appendChild(savetextarea);
-        })();
-}else{
-        //dojo.body() is not available before onLoad is fired
-        try {
-                dojo.doc().write('<textarea id="dojo.widget.RichText.savedContent" ' +
-                        'style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>');
-        }catch(e){ }
+// but do not try doing document.write if we are using xd loading.
+// document.write will only work if RichText.js is included in the dojo.js
+// file. If it is included in dojo.js and you want to allow rich text saving
+// for back/forward actions, then set djConfig.allowXdRichTextSave = true.
+if(!djConfig["useXDomain"] || djConfig["allowXdRichTextSave"]){
+        if(dojo.hostenv.post_load_){
+                (function(){
+                        var savetextarea = dojo.doc().createElement('textarea');
+                        savetextarea.id = "dojo.widget.RichText.savedContent";
+                        savetextarea.style = "display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;";
+                        dojo.body().appendChild(savetextarea);
+                })();
+        }else{
+                //dojo.body() is not available before onLoad is fired
+                try {
+                        dojo.doc().write('<textarea id="dojo.widget.RichText.savedContent" ' +
+                                'style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>');
+                }catch(e){ }
+        }
 }
 
@@ -269 +275 @@
                         this.domNode.appendChild(this.editingArea);
 
-                        if(this.saveName != ""){
+                        if(this.saveName != "" && (!djConfig["useXDomain"] || djConfig["allowXdRichTextSave"])){
                                 var saveTextarea = dojo.doc().getElementById("dojo.widget.RichText.savedContent");
                                 if (saveTextarea.value != "") {

trunk/tests/widget/Editor/test_Editor2.html

@@ -32 +32 @@
                 <div dojoType="Editor2" 
                         htmlEditing="true" useActiveX="true" 
-                        shareToolbar="false" id="editor" toolbarAlwaysVisible="true">
+                        shareToolbar="false" id="editor" toolbarAlwaysVisible="true" saveName="testEditor1">
                         look ma! it's editable content!
                         <ul>