vanilla ckeditor-3.6.2

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

diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index b3e5d9c..25e6ef4 100644 (file)
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -3,6 +3,11 @@ Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
+/**\r
+ * @fileOverview The "colorbutton" plugin that makes it possible to assign\r
+ *               text and background colors to editor contents.\r
+ *\r
+ */\r
 CKEDITOR.plugins.add( 'colorbutton',\r
 {\r
        requires : [ 'panelbutton', 'floatpanel', 'styles' ],\r
@@ -136,8 +141,8 @@ CKEDITOR.plugins.add( 'colorbutton',
                                                        :\r
                                                        function( element )\r
                                                        {\r
-                                                               // Fore color style must be applied inside links instead of around it.\r
-                                                               return element.getName() != 'a' || isUnstylable( element );\r
+                                                               // Fore color style must be applied inside links instead of around it. (#4772,#6908)\r
+                                                               return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element );\r
                                                        };\r
 \r
                                                new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document );\r
@@ -225,24 +230,24 @@ CKEDITOR.plugins.add( 'colorbutton',
 });\r
 \r
 /**\r
- * Whether to enable the "More Colors..." button in the color selectors.\r
+ * Whether to enable the <strong>More Colors</strong> button in the color selectors.\r
  * @name CKEDITOR.config.colorButton_enableMore\r
- * @default true\r
+ * @default <code>true</code>\r
  * @type Boolean\r
  * @example\r
  * config.colorButton_enableMore = false;\r
  */\r
 \r
 /**\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
+ * Defines the colors to be displayed in the color selectors. This is a string\r
+ * containing hexadecimal notation for HTML colors, without the "#" prefix.\r
+ * <br /><br />\r
+ * Since 3.3: A color name may optionally be defined by prefixing the entries with\r
+ * a name and the slash character. For example, "FontColor1/FF9900" will be\r
+ * displayed as the color #FF9900 in the selector, but will be output as "FontColor1".\r
  * @name CKEDITOR.config.colorButton_colors\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
+ * @default <code>'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'</code>\r
  * @example\r
  * // Brazil colors only.\r
  * config.colorButton_colors = '00923E,F8C100,28166F';\r
@@ -257,11 +262,12 @@ CKEDITOR.config.colorButton_colors =
        'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';\r
 \r
 /**\r
- * Holds the style definition to be used to apply the text foreground color.\r
+ * Stores the style definition that applies the text foreground color.\r
  * @name CKEDITOR.config.colorButton_foreStyle\r
  * @type Object\r
+ * @default (see example)\r
  * @example\r
- * // This is basically the default setting value.\r
+ * // This is actually the default value.\r
  * config.colorButton_foreStyle =\r
  *     {\r
  *         element : 'span',\r
@@ -276,11 +282,12 @@ CKEDITOR.config.colorButton_foreStyle =
        };\r
 \r
 /**\r
- * Holds the style definition to be used to apply the text background color.\r
+ * Stores the style definition that applies the text background color.\r
  * @name CKEDITOR.config.colorButton_backStyle\r
  * @type Object\r
+ * @default (see example)\r
  * @example\r
- * // This is basically the default setting value.\r
+ * // This is actually the default value.\r
  * config.colorButton_backStyle =\r
  *     {\r
  *         element : 'span',\r