Changeset 13068

Timestamp:

03/13/08 07:11:39 (10 months ago)

Author:

peller

Message:

Normalize commands, and only quote fonts. Safari seems to handle formatBlock now. Fixes #6193.

Location:

dijit/trunk/_editor

Files:

• plugins/FontChoice.js (modified) (1 diff)
• RichText.js (modified) (2 diffs)

dijit/trunk/_editor/plugins/FontChoice.js

@@ -77 +77 @@
                                         dijit.focus(this._focusHandle);
                                 }
-                                this.editor.execCommand(this.command, "'" + choice + "'");
+                                if(this.command == "fontName"){ choice = "'" + choice + "'"; }
+                                this.editor.execCommand(this.editor._normalizeCommand(this.command), choice);
                         });
                 },

dijit/trunk/_editor/RichText.js

@@ -670 +670 @@
                         // Firefox throws an exception if the editor is initially hidden
                         // so, if this fails, try again onClick by adding "once" advice
+//TODO: try mousedown instead
                         var handle = dojo.connect(this, "onClick", this, function(){
                                 this.setDisabled(false);
@@ -896 +897 @@
 
                 var command = cmd.toLowerCase();
-                if(command == "formatblock"){
-                        if(dojo.isSafari){ command = "heading"; }
-                }else if(command == "hilitecolor" && !dojo.isMoz){
+                if(command == "hilitecolor" && !dojo.isMoz){
                         command = "backcolor";
                 }