vanilla ckeditor-3.6.1

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

diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index 0fb8c05..b3e5d9c 100644 (file)
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -66,14 +66,14 @@ CKEDITOR.plugins.add( 'colorbutton',
                                                        color;\r
 \r
                                                // Find the closest block element.\r
-                                               block = path.block || path.blockLimit;\r
+                                               block = path.block || path.blockLimit || editor.document.getBody();\r
 \r
                                                // The background color might be transparent. In that case, look up the color in the DOM tree.\r
                                                do\r
                                                {\r
                                                        color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';\r
                                                }\r
-                                               while ( type == 'back' && color == 'transparent' && ( block = block.getParent() ) );\r
+                                               while ( type == 'back' && color == 'transparent' && block && ( block = block.getParent() ) );\r
 \r
                                                // The box should never be transparent.\r
                                                if ( !color || color == 'transparent' )\r
@@ -115,8 +115,7 @@ CKEDITOR.plugins.add( 'colorbutton',
 \r
                                        editor.focus();\r
 \r
-                                       panel.hide();\r
-\r
+                                       panel.hide( false );\r
 \r
                                        editor.fire( 'saveSnapshot' );\r
 \r
@@ -220,13 +219,14 @@ CKEDITOR.plugins.add( 'colorbutton',
 \r
                function isUnstylable( ele )\r
                {\r
-                       return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-cke-nostyle' );\r
+                       return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );\r
                }\r
        }\r
 });\r
 \r
 /**\r
  * Whether to enable the "More Colors..." button in the color selectors.\r
+ * @name CKEDITOR.config.colorButton_enableMore\r
  * @default true\r
  * @type Boolean\r
  * @example\r
@@ -240,6 +240,7 @@ CKEDITOR.plugins.add( 'colorbutton',
  * 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
+ * @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
  * @example\r
@@ -257,6 +258,7 @@ CKEDITOR.config.colorButton_colors =
 \r
 /**\r
  * Holds the style definition to be used to apply the text foreground color.\r
+ * @name CKEDITOR.config.colorButton_foreStyle\r
  * @type Object\r
  * @example\r
  * // This is basically the default setting value.\r
@@ -275,6 +277,7 @@ CKEDITOR.config.colorButton_foreStyle =
 \r
 /**\r
  * Holds the style definition to be used to apply the text background color.\r
+ * @name CKEDITOR.config.colorButton_backStyle\r
  * @type Object\r
  * @example\r
  * // This is basically the default setting value.\r