X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=b3e5d9cc17143aa32f10c731beeecf6424ea1515;hb=f0610347140239143439a511ee2bd48cb784f470;hp=c87d068c38d8ee74cb33d39b68b43c42caf244a7;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js index c87d068..b3e5d9c 100644 --- a/_source/plugins/colorbutton/plugin.js +++ b/_source/plugins/colorbutton/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, 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 */ @@ -22,6 +22,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, @@ -39,22 +40,52 @@ CKEDITOR.plugins.add( 'colorbutton', { 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( ',' ), @@ -84,15 +115,34 @@ CKEDITOR.plugins.add( 'colorbutton', 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. + return element.getName() != 'a' || isUnstylable( element ); + }; + + new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document ); + } + editor.fire( 'saveSnapshot' ); }); @@ -106,7 +156,7 @@ CKEDITOR.plugins.add( 'colorbutton', '' + '' + '' + '' ); - 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( '' + @@ -150,33 +209,45 @@ CKEDITOR.plugins.add( 'colorbutton', ' role="option" aria-posinset="', total, '" aria-setsize="', total, '">', lang.more, '' + - '' ); // It is later in the code. + '' ); // tr is later in the code. } output.push( '
' + - '' + + '' + '', lang.auto, @@ -122,13 +172,22 @@ CKEDITOR.plugins.add( 'colorbutton', if ( ( i % 8 ) === 0 ) output.push( '
' + '' + '' + @@ -137,7 +196,7 @@ CKEDITOR.plugins.add( 'colorbutton', } // Render the "More Colors" button. - if ( config.colorButton_enableMore ) + if ( config.colorButton_enableMore === undefined || config.colorButton_enableMore ) { 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 + * @name CKEDITOR.config.colorButton_enableMore + * @default true * @type Boolean * @example * config.colorButton_enableMore = false; */ -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". + * @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' * @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,' + @@ -187,6 +258,7 @@ CKEDITOR.config.colorButton_colors = /** * Holds the style definition to be used to apply the text foreground color. + * @name CKEDITOR.config.colorButton_foreStyle * @type Object * @example * // This is basically the default setting value. @@ -200,17 +272,12 @@ CKEDITOR.config.colorButton_foreStyle = { element : 'span', styles : { 'color' : '#(color)' }, - overrides : [ { element : 'font', attributes : { 'color' : null } } ], - - // Fore color style must be applied inside links instead of around it. - childRule : function( element ) - { - return element.getName() != 'a'; - } + overrides : [ { element : 'font', attributes : { 'color' : null } } ] }; /** * Holds the style definition to be used to apply the text background color. + * @name CKEDITOR.config.colorButton_backStyle * @type Object * @example * // This is basically the default setting value.