Ticket #76: default_combo_labels.patch

editor/_source/classes/fcktoolbarfontformatcombo.js

@@ -15 +15 @@
         this.NormalLabel = 'Normal' ;
         
         this.PanelWidth = 190 ;
+
+        this.DefaultLabel = FCKConfig.DefaultFontFormatLabel || '' ;
 }
 
 // Inherit from FCKToolbarSpecialCombo.
@@ -80 +82 @@
         {
 //              FCKDebug.Output( 'FCKToolbarFontFormatCombo Value: ' + value ) ;
 
-                // IE returns normal for DIV and P, so to avoid confusion, we will not show it if normal.
+                // IE returns normal for DIV and P, so to avoid confusion, we will not show it as normal.
                 if ( value == this.NormalLabel )
                 {
                         if ( combo.Label != ' ' )
                                 combo.DeselectAll(true) ;
+
+                        combo.SetLabel( this.DefaultLabel ) ;
                 }
                 else
                 {
                         if ( this._LastValue == value )
                                 return ;
 
+                        if ( !value || value.length == 0 )
+                        {
+                                combo.DeselectAll() ;
+                                combo.SetLabel( this.DefaultLabel ) ;
+                        }
+
                         combo.SelectItemByLabel( value, true ) ;
                 }
 

editor/_source/classes/fcktoolbarfontscombo.js

@@ -11 +11 @@
         this.Label              = this.GetLabel() ;
         this.Tooltip    = tooltip ? tooltip : this.Label ;
         this.Style              = style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+        this.DefaultLabel = FCKConfig.DefaultFontLabel || '' ;
 }
 
 // Inherit from FCKToolbarSpecialCombo.

editor/_source/classes/fcktoolbarfontsizecombo.js

@@ -11 +11 @@
         this.Label              = this.GetLabel() ;
         this.Tooltip    = tooltip ? tooltip : this.Label ;
         this.Style              = style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+        this.DefaultLabel = FCKConfig.DefaultFontSizeLabel || '' ;
 }
 
 // Inherit from FCKToolbarSpecialCombo.

editor/_source/classes/fcktoolbarspecialcombo.js

@@ -21 +21 @@
 
 FCKToolbarSpecialCombo.prototype.TypeOf = 'FCKToolbarSpecialCombo' ;            // @Packager.RemoveLine 
 
+FCKToolbarSpecialCombo.prototype.DefaultLabel = '' ;
+
 function FCKToolbarSpecialCombo_OnSelect( itemId, item )
 {
         FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).Execute( itemId, item ) ;
@@ -81 +83 @@
                                 if ( this._LastValue != sValue )
                                 {
                                         this._LastValue = sValue ;
-                                        FCKToolbarSpecialCombo_RefreshActiveItems( this._Combo, sValue ) ;
+
+                                        if ( !sValue || sValue.length == 0 )
+                                        {
+                                                this._Combo.DeselectAll() ;
+                                                this._Combo.SetLabel( this.DefaultLabel ) ;
+                                        }
+                                        else
+                                                FCKToolbarSpecialCombo_RefreshActiveItems( this._Combo, sValue ) ;
                                 }
                         }
                 }

editor/_source/classes/fcktoolbarstylecombo.js

@@ -11 +11 @@
         this.Label              = this.GetLabel() ;
         this.Tooltip    = tooltip ? tooltip : this.Label ;
         this.Style              = style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+        this.DefaultLabel = FCKConfig.DefaultStyleLabel || '' ;
 }
 
 // Inherit from FCKToolbarSpecialCombo.
@@ -77 +79 @@
                 targetSpecialCombo.SetLabelById( aStyles[0].Name ) ;
         }
         else
-                targetSpecialCombo.SetLabel('') ;
+                targetSpecialCombo.SetLabel(this.DefaultLabel) ;
 }
 
 FCKToolbarStyleCombo.prototype.RefreshVisibleItems = function( targetSpecialCombo )

fckconfig.js

@@ -152 +152 @@
 FCKConfig.BodyId = '' ;
 FCKConfig.BodyClass = '' ;
 
+FCKConfig.DefaultStyleLabel = '' ;
+FCKConfig.DefaultFontFormatLabel = '' ;
+FCKConfig.DefaultFontLabel = '' ;
+FCKConfig.DefaultFontSizeLabel = '' ;
+
 // The option switches between trying to keep the html structure or do the changes so the content looks like it was in Word
 FCKConfig.CleanWordKeepsStructure = false ;