Changeset 8069

Timestamp:

04/12/07 05:47:50 (21 months ago)

Author:

liucougar

Message:

encoding text node correctly
set contentReadOnly to disable/enable the editor

Files:

• trunk/src/widget/RichText.js (modified) (5 diffs)

trunk/src/widget/RichText.js

@@ -735 +735 @@
                                 this.editNode.contentEditable=true;
                         }else{ //moz
-                                this.document.designMode='on';
+                                this.document.execCommand('contentReadOnly', false, false);
+//                              this.document.designMode='on';
                         }
                         this.enabled=true;
@@ -744 +745 @@
                                 this.editNode.contentEditable=false;
                         }else{ //moz
-                                this.blur(); //to remove the blinking caret
-                                this.document.designMode='off';
+                                this.document.execCommand('contentReadOnly', false, true);
+//                              this.blur(); //to remove the blinking caret
+//                              this.document.designMode='off';
                         }
                         this.enabled=false;
@@ -764 +766 @@
 
                                 try { // sanity check for Mozilla
-                                        this.document.execCommand("useCSS", false, true); // old moz call
+//                                      this.document.execCommand("useCSS", false, true); // old moz call
                                         this.document.execCommand("styleWithCSS", false, false); // new moz call
                                         //this.document.execCommand("insertBrOnReturn", false, false); // new moz call
@@ -1236 +1238 @@
                                 dojo.withGlobal(this.window, "selectElement", dojo.html.selection, [a]);
 
-                                returnValue = this.document.execCommand("unlink", false, null);
-
-//                              // restore original selection
-//                              var selectionRange = this.document.createRange();
-//                              selectionRange.setStart(selectionStartContainer, selectionStartOffset);
-//                              selectionRange.setEnd(selectionEndContainer, selectionEndOffset);
-//                              selection.removeAllRanges();
-//                              selection.addRange(selectionRange);
-
-                                return returnValue;
+                                return this.document.execCommand("unlink");
                         }else if((command == "hilitecolor")&&(dojo.render.html.mozilla)){
-                                // mozilla doesn't support hilitecolor properly when useCSS is
-                                // set to false (bugzilla #279330)
-
-                                this.document.execCommand("useCSS", false, false);
+//                              // mozilla doesn't support hilitecolor properly when useCSS is
+//                              // set to false (bugzilla #279330)
+
+//                              this.document.execCommand("useCSS", false, false);
                                 returnValue = this.document.execCommand(command, false, argument);
-                                this.document.execCommand("useCSS", false, true);
+//                              this.document.execCommand("useCSS", false, true);
 
                         }else if((dojo.render.html.ie)&&( (command == "backcolor")||(command == "forecolor") )){
@@ -1585 +1578 @@
                                         break;
                                 case 3: //text
-                                        var output = node.nodeValue;
+                                        var output = dojo.string.escapeXml(node.nodeValue,true);
                                         break;
                                 case 8: //comment
-                                        var output = '<!--'+node.nodeValue+'-->';
+                                        var output = '<!--'+dojo.string.escapeXml(node.nodeValue,true)+'-->';
                                         break;
                                 default: