X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=2a14bb07dcfaa54f73dd87750cd2a50cae53e239;hb=refs%2Ftags%2Fv3.2.1;hp=b49e5f84da27970f70db0ed83f26f2b5a4cc122b;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git
diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index b49e5f8..2a14bb0 100644
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -31,20 +31,22 @@ CKEDITOR.plugins.add( 'colorbutton',
panel :
{
- css : editor.skin.editor.css
+ css : editor.skin.editor.css,
+ attributes : { role : 'listbox', 'aria-label' : lang.panelTitle }
},
- onBlock : function( panel, blockName )
+ onBlock : function( panel, block )
{
- var block = panel.addBlock( blockName );
block.autoSize = true;
block.element.addClass( 'cke_colorblock' );
block.element.setHtml( renderColors( panel, type ) );
var keys = block.keys;
keys[ 39 ] = 'next'; // ARROW-RIGHT
+ keys[ 40 ] = 'next'; // ARROW-DOWN
keys[ 9 ] = 'next'; // TAB
keys[ 37 ] = 'prev'; // ARROW-LEFT
+ keys[ 38 ] = 'prev'; // ARROW-UP
keys[ CKEDITOR.SHIFT + 9 ] = 'prev'; // SHIFT + TAB
keys[ 32 ] = 'click'; // SPACE
}
@@ -55,7 +57,8 @@ CKEDITOR.plugins.add( 'colorbutton',
function renderColors( panel, type )
{
var output = [],
- colors = config.colorButton_colors.split( ',' );
+ colors = config.colorButton_colors.split( ',' ),
+ total = colors.length + ( config.colorButton_enableMore ? 2 : 1 );
var clickFn = CKEDITOR.tools.addFunction( function( color, type )
{
@@ -83,13 +86,25 @@ CKEDITOR.plugins.add( 'colorbutton',
panel.hide();
- var style = new CKEDITOR.style( config['colorButton_' + type + 'Style'], color && { color : color } );
editor.fire( 'saveSnapshot' );
+
+ // Clean up any conflicting style within the range.
+ new CKEDITOR.style( config['colorButton_' + type + 'Style'], { color : 'inherit' } ).remove( editor.document );
+
if ( color )
- style.apply( editor.document );
- else
- style.remove( editor.document );
+ {
+ var colorStyle = config['colorButton_' + type + 'Style'];
+
+ colorStyle.childRule = type == 'back' ?
+ // It's better to apply background color as the innermost style. (#3599)
+ function(){ return false; } :
+ // Fore color style must be applied inside links instead of around it.
+ function( element ){ return element.getName() != 'a'; };
+
+ new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document );
+ }
+
editor.fire( 'saveSnapshot' );
});
@@ -98,8 +113,9 @@ CKEDITOR.plugins.add( 'colorbutton',
'' +
- '
' +
+ ' href="javascript:void(\'', lang.auto, '\')"' +
+ ' role="option" aria-posinset="1" aria-setsize="', total, '">' +
+ '' +
'' +
'' +
'' +
@@ -110,7 +126,7 @@ CKEDITOR.plugins.add( 'colorbutton',
' |
' +
'
' +
'' +
- '' );
+ '' );
// Render the color boxes.
for ( var i = 0 ; i < colors.length ; i++ )
@@ -118,14 +134,23 @@ CKEDITOR.plugins.add( 'colorbutton',
if ( ( i % 8 ) === 0 )
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(
'' +
'' +
+ ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +
+ ' href="javascript:void(\'', colorLabel, '\')"' +
+ ' role="option" aria-posinset="', ( i + 2 ), '" aria-setsize="', total, '">' +
'' +
'' +
' | ' );
@@ -141,7 +166,8 @@ CKEDITOR.plugins.add( 'colorbutton',
'',
+ ' href="javascript:void(\'', lang.more, '\')"',
+ ' role="option" aria-posinset="', total, '" aria-setsize="', total, '">',
lang.more,
'' +
'' ); // It is later in the code.
@@ -166,11 +192,17 @@ CKEDITOR.config.colorButton_enableMore = true;
/**
* 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'
* @example
* // Brazil colors only.
* config.colorButton_colors = '00923E,F8C100,28166F';
+ * @example
+ * config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00'
*/
CKEDITOR.config.colorButton_colors =
'000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' +