Changeset 895

Show
Ignore:
Timestamp:
2007-09-27 11:37:35 (14 months ago)
Author:
martinkou
Message:

Fixed #1288 : Made the "More Colors" button optional.

Location:
FCKeditor/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js

    r885 r895  
    161161 
    162162        // Create the Row and the Cell for the "More Colors..." button. 
    163         oCell = oTable.insertRow(-1).insertCell(-1) ; 
    164         oCell.colSpan = 8 ; 
     163        if ( FCKConfig.EnableMoreFontColors ) 
     164        { 
     165                oCell = oTable.insertRow(-1).insertCell(-1) ; 
     166                oCell.colSpan = 8 ; 
    165167 
    166         oDiv = oCell.appendChild( CreateSelectionDiv() ) ; 
    167         oDiv.innerHTML = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">' + FCKLang.ColorMoreColors + '</td></tr></table>' ; 
     168                oDiv = oCell.appendChild( CreateSelectionDiv() ) ; 
     169                oDiv.innerHTML = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">' + FCKLang.ColorMoreColors + '</td></tr></table>' ; 
    168170 
    169         FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ; 
     171                FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ; 
     172        } 
    170173 
    171174        if ( FCKBrowserInfo.IsSafari ) 

  • FCKeditor/trunk/fckconfig.js

    r850 r895  
    151151FCKConfig.BrowserContextMenuOnCtrl = false ; 
    152152 
     153FCKConfig.EnableMoreFontColors = true ; 
    153154FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; 
    154155