vanilla ckeditor-3.2.1

[ckeditor.git] / _source / plugins / colorbutton / plugin.js

diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index c87d068..2a14bb0 100644 (file)
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -86,13 +86,25 @@ CKEDITOR.plugins.add( 'colorbutton',
 \r
                                        panel.hide();\r
 \r
-                                       var style = new CKEDITOR.style( config['colorButton_' + type + 'Style'], color && { color : color } );\r
 \r
                                        editor.fire( 'saveSnapshot' );\r
+\r
+                                       // Clean up any conflicting style within the range.\r
+                                       new CKEDITOR.style( config['colorButton_' + type + 'Style'], { color : 'inherit' } ).remove( editor.document );\r
+\r
                                        if ( color )\r
-                                               style.apply( editor.document );\r
-                                       else\r
-                                               style.remove( editor.document );\r
+                                       {\r
+                                               var colorStyle = config['colorButton_' + type + 'Style'];\r
+\r
+                                               colorStyle.childRule = type == 'back' ?\r
+                                                       // It's better to apply background color as the innermost style. (#3599)\r
+                                                       function(){ return false; } :\r
+                                                       // Fore color style must be applied inside links instead of around it.\r
+                                                       function( element ){ return element.getName() != 'a'; };\r
+\r
+                                               new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document );\r
+                                       }\r
+\r
                                        editor.fire( 'saveSnapshot' );\r
                                });\r
 \r
@@ -122,13 +134,21 @@ CKEDITOR.plugins.add( 'colorbutton',
                                if ( ( i % 8 ) === 0 )\r
                                        output.push( '</tr><tr>' );\r
 \r
-                               var colorCode = colors[ i ];\r
+                               var parts = colors[ i ].split( '/' ),\r
+                                       colorName = parts[ 0 ],\r
+                                       colorCode = parts[ 1 ] || colorName;\r
+\r
+                               // The data can be only a color code (without #) or colorName + color code\r
+                               // If only a color code is provided, then the colorName is the color with the hash\r
+                               if (!parts[1])\r
+                                       colorName = '#' + colorName;\r
+\r
                                var colorLabel = editor.lang.colors[ colorCode ] || colorCode;\r
                                output.push(\r
                                        '<td>' +\r
                                                '<a class="cke_colorbox" _cke_focus=1 hidefocus=true' +\r
                                                        ' title="', colorLabel, '"' +\r
-                                                       ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', colorCode, '\',\'', type, '\'); return false;"' +\r
+                                                       ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +\r
                                                        ' href="javascript:void(\'', colorLabel, '\')"' +\r
                                                        ' role="option" aria-posinset="', ( i + 2 ), '" aria-setsize="', total, '">' +\r
                                                        '<span class="cke_colorbox" style="background-color:#', colorCode, '"></span>' +\r
@@ -172,11 +192,17 @@ CKEDITOR.config.colorButton_enableMore = true;
 /**\r
  * Defines the colors to be displayed in the color selectors. It's a string\r
  * containing the hexadecimal notation for HTML colors, without the "#" prefix.\r
+ *\r
+ * Since 3.3: A name may be optionally defined by prefixing the entries with the\r
+ * name and the slash character. For example, "FontColor1/FF9900" will be\r
+ * displayed as the color #FF9900 in the selector, but will be outputted as "FontColor1".\r
  * @type String\r
  * @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'\r
  * @example\r
  * // Brazil colors only.\r
  * config.colorButton_colors = '00923E,F8C100,28166F';\r
+ * @example\r
+ * config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00'\r
  */\r
 CKEDITOR.config.colorButton_colors =\r
        '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' +\r
@@ -200,13 +226,7 @@ CKEDITOR.config.colorButton_foreStyle =
        {\r
                element         : 'span',\r
                styles          : { 'color' : '#(color)' },\r
-               overrides       : [ { element : 'font', attributes : { 'color' : null } } ],\r
-\r
-               // Fore color style must be applied inside links instead of around it.\r
-               childRule : function( element )\r
-               {\r
-                       return element.getName() != 'a';\r
-               }\r
+               overrides       : [ { element : 'font', attributes : { 'color' : null } } ]\r
        };\r
 \r
 /**\r