X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=25e6ef444c167446d60869b82126a05672f1c10d;hb=refs%2Ftags%2Fv3.6.2;hp=747716e753ef11b762419808e288a29e9471e4bb;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git
diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index 747716e..25e6ef4 100644
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -1,8 +1,13 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
+/**
+ * @fileOverview The "colorbutton" plugin that makes it possible to assign
+ * text and background colors to editor contents.
+ *
+ */
CKEDITOR.plugins.add( 'colorbutton',
{
requires : [ 'panelbutton', 'floatpanel', 'styles' ],
@@ -22,6 +27,7 @@ CKEDITOR.plugins.add( 'colorbutton',
function addButton( name, type, title )
{
+ var colorBoxId = CKEDITOR.tools.getNextId() + '_colorBox';
editor.ui.add( name, CKEDITOR.UI_PANELBUTTON,
{
label : title,
@@ -31,52 +37,117 @@ CKEDITOR.plugins.add( 'colorbutton',
panel :
{
- css : [ CKEDITOR.getUrl( editor.skinPath + '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 ) );
+ block.element.setHtml( renderColors( panel, type, colorBoxId ) );
+ // The block should not have scrollbars (#5933, #6056)
+ block.element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
+
+ CKEDITOR.ui.fire( 'ready', this );
var keys = block.keys;
- keys[ 39 ] = 'next'; // ARROW-RIGHT
+ var rtl = editor.lang.dir == 'rtl';
+ keys[ rtl ? 37 : 39 ] = 'next'; // ARROW-RIGHT
+ keys[ 40 ] = 'next'; // ARROW-DOWN
keys[ 9 ] = 'next'; // TAB
- keys[ 37 ] = 'prev'; // ARROW-LEFT
+ keys[ rtl ? 39 : 37 ] = 'prev'; // ARROW-LEFT
+ keys[ 38 ] = 'prev'; // ARROW-UP
keys[ CKEDITOR.SHIFT + 9 ] = 'prev'; // SHIFT + TAB
keys[ 32 ] = 'click'; // SPACE
+ },
+
+ // The automatic colorbox should represent the real color (#6010)
+ onOpen : function()
+ {
+ var selection = editor.getSelection(),
+ block = selection && selection.getStartElement(),
+ path = new CKEDITOR.dom.elementPath( block ),
+ color;
+
+ // Find the closest block element.
+ block = path.block || path.blockLimit || editor.document.getBody();
+
+ // The background color might be transparent. In that case, look up the color in the DOM tree.
+ do
+ {
+ color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';
+ }
+ while ( type == 'back' && color == 'transparent' && block && ( block = block.getParent() ) );
+
+ // The box should never be transparent.
+ if ( !color || color == 'transparent' )
+ color = '#ffffff';
+
+ this._.panel._.iframe.getFrameDocument().getById( colorBoxId ).setStyle( 'background-color', color );
}
});
}
- function renderColors( panel, type )
+ function renderColors( panel, type, colorBoxId )
{
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 )
{
if ( color == '?' )
{
- // TODO : Implement the colors dialog.
- // editor.openDialog( '' );
+ var applyColorStyle = arguments.callee;
+ function onColorDialogClose( evt )
+ {
+ this.removeListener( 'ok', onColorDialogClose );
+ this.removeListener( 'cancel', onColorDialogClose );
+
+ evt.name == 'ok' && applyColorStyle( this.getContentElement( 'picker', 'selectedColor' ).getValue(), type );
+ }
+
+ editor.openDialog( 'colordialog', function()
+ {
+ this.on( 'ok', onColorDialogClose );
+ this.on( 'cancel', onColorDialogClose );
+ } );
+
return;
}
editor.focus();
- panel.hide();
-
- var style = new CKEDITOR.style( config['colorButton_' + type + 'Style'], color && { color : color } );
+ panel.hide( false );
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' ?
+ function( element )
+ {
+ // It's better to apply background color as the innermost style. (#3599)
+ // Except for "unstylable elements". (#6103)
+ return isUnstylable( element );
+ }
+ :
+ function( element )
+ {
+ // Fore color style must be applied inside links instead of around it. (#4772,#6908)
+ return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element );
+ };
+
+ new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document );
+ }
+
editor.fire( 'saveSnapshot' );
});
@@ -85,11 +156,12 @@ CKEDITOR.plugins.add( 'colorbutton',
'' +
- '
' +
+ ' href="javascript:void(\'', lang.auto, '\')"' +
+ ' role="option" aria-posinset="1" aria-setsize="', total, '">' +
+ '' +
'' +
'' +
- '' +
+ '' +
' | ' +
'',
lang.auto,
@@ -97,7 +169,7 @@ CKEDITOR.plugins.add( 'colorbutton',
' |
' +
'
' +
'' +
- '' );
+ '' );
// Render the color boxes.
for ( var i = 0 ; i < colors.length ; i++ )
@@ -105,21 +177,31 @@ 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
+ // Convert the color from RGB to RRGGBB for better compatibility with IE and . See #5676
+ if (!parts[1])
+ colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' );
+
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, '">' +
'' +
'' +
' | ' );
}
// Render the "More Colors" button.
- if ( config.colorButton_enableMore )
+ if ( config.colorButton_enableMore === undefined || config.colorButton_enableMore )
{
output.push(
'
' +
@@ -128,36 +210,49 @@ 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.
+ '' ); // tr is later in the code.
}
output.push( '
' );
return output.join( '' );
}
+
+ function isUnstylable( ele )
+ {
+ return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
+ }
}
});
/**
- * Whether to enable the "More Colors..." button in the color selectors.
- * @default false
+ * Whether to enable the More Colors button in the color selectors.
+ * @name CKEDITOR.config.colorButton_enableMore
+ * @default true
* @type Boolean
* @example
* config.colorButton_enableMore = false;
*/
-CKEDITOR.config.colorButton_enableMore = false;
/**
- * Defines the colors to be displayed in the color selectors. It's a string
- * containing the hexadecimal notation for HTML colors, without the "#" prefix.
+ * Defines the colors to be displayed in the color selectors. This is a string
+ * containing hexadecimal notation for HTML colors, without the "#" prefix.
+ *
+ * Since 3.3: A color name may optionally be defined by prefixing the entries with
+ * a name and the slash character. For example, "FontColor1/FF9900" will be
+ * displayed as the color #FF9900 in the selector, but will be output as "FontColor1".
+ * @name CKEDITOR.config.colorButton_colors
* @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'
+ * @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,' +
@@ -167,10 +262,12 @@ CKEDITOR.config.colorButton_colors =
'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';
/**
- * Holds the style definition to be used to apply the text foreground color.
+ * Stores the style definition that applies the text foreground color.
+ * @name CKEDITOR.config.colorButton_foreStyle
* @type Object
+ * @default (see example)
* @example
- * // This is basically the default setting value.
+ * // This is actually the default value.
* config.colorButton_foreStyle =
* {
* element : 'span',
@@ -185,10 +282,12 @@ CKEDITOR.config.colorButton_foreStyle =
};
/**
- * Holds the style definition to be used to apply the text background color.
+ * Stores the style definition that applies the text background color.
+ * @name CKEDITOR.config.colorButton_backStyle
* @type Object
+ * @default (see example)
* @example
- * // This is basically the default setting value.
+ * // This is actually the default value.
* config.colorButton_backStyle =
* {
* element : 'span',