Ticket #5150: 5150.patch

_source/plugins/colorbutton/plugin.js

@@ -118 +118 @@
                                 if ( ( i % 8 ) === 0 )
                                         output.push( '</tr><tr>' );
 
-                                var colorCode = colors[ i ];
+                                var parts = colors[ i ].split( '/' ),
+                                        colorName = parts[ 0 ],
+                                        colorCode = '#' + ( parts[ 1 ] || colorName ) ;
+
                                 var colorLabel = editor.lang.colors[ colorCode ] || colorCode;
                                 output.push(
                                         '<td>' +
                                                 '<a class="cke_colorbox" _cke_focus=1 hidefocus=true' +
                                                         ' title="', colorLabel, '"' +
-                                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', colorCode, '\',\'', type, '\'); return false;"' +
+                                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +
                                                         ' href="javascript:void(\'', colorLabel, '\')">' +
-                                                        '<span class="cke_colorbox" style="background-color:#', colorCode, '"></span>' +
+                                                        '<span class="cke_colorbox" style="background-color:', colorCode, '"></span>' +
                                                 '</a>' +
                                         '</td>' );
                         }
@@ -187 +190 @@
  * config.colorButton_foreStyle =
  *     {
  *         element : 'span',
- *         styles : { 'color' : '#(color)' }
+ *         styles : { 'color' : '##(color)' }
  *     };
  */
 CKEDITOR.config.colorButton_foreStyle =
         {
                 element         : 'span',
-                styles          : { 'color' : '#(color)' },
+                styles          : { 'color' : '##(color)' },
                 overrides       : [ { element : 'font', attributes : { 'color' : null } } ],
 
                 // Fore color style must be applied inside links instead of around it.
@@ -211 +214 @@
  * config.colorButton_backStyle =
  *     {
  *         element : 'span',
- *         styles : { 'background-color' : '#(color)' }
+ *         styles : { 'background-color' : '##(color)' }
  *     };
  */
 CKEDITOR.config.colorButton_backStyle =
         {
                 element         : 'span',
-                styles          : { 'background-color' : '#(color)' }
+                styles          : { 'background-color' : '##(color)' }
         };