Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5229)
+++ /CKEditor/trunk/CHANGES.html (revision 5230)
@@ -41,4 +41,5 @@
- #4478 : Enable the SelectAll command in source mode.
+ - #5150 : Allow names in the CKEDITOR.config.colorButton_colors setting.
Index: /CKEditor/trunk/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/colorbutton/plugin.js (revision 5229)
+++ /CKEditor/trunk/_source/plugins/colorbutton/plugin.js (revision 5230)
@@ -123,5 +123,13 @@
output.push( '
' );
- var colorCode = colors[ i ];
+ var parts = colors[ i ].split( '/' ),
+ colorName = parts[ 0 ],
+ colorCode = parts[ 1 ] || colorName;
+
+ // The data can be only a color code (without #) or colorName + color code
+ // If only a color code is provided, then the colorName is the color with the hash
+ if (!parts[1])
+ colorName = '#' + colorName;
+
var colorLabel = editor.lang.colors[ colorCode ] || colorCode;
output.push(
@@ -129,5 +137,5 @@
'' +
@@ -173,4 +181,8 @@
* Defines the colors to be displayed in the color selectors. It's a string
* containing the hexadecimal notation for HTML colors, without the "#" prefix.
+ *
+ * Since 3.3: A name may be optionally defined by prefixing the entries with the
+ * name and the slash character. For example, "FontColor1/FF9900" will be
+ * displayed as the color #FF9900 in the selector, but will be outputted as "FontColor1".
* @type String
* @default '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF'
@@ -178,4 +190,6 @@
* // Brazil colors only.
* config.colorButton_colors = '00923E,F8C100,28166F';
+ * @example
+ * config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00'
*/
CKEDITOR.config.colorButton_colors =