X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=16ad1f2813722a265f46bb8bcf9747f7208d0232;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=c87d068c38d8ee74cb33d39b68b43c42caf244a7;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js index c87d068..16ad1f2 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; + + // 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( ',' ), @@ -86,13 +117,33 @@ 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' ? + 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 +157,7 @@ CKEDITOR.plugins.add( 'colorbutton', '
' + - '' + + '' + ' | ' + '', lang.auto, @@ -122,13 +173,22 @@ CKEDITOR.plugins.add( 'colorbutton', if ( ( i % 8 ) === 0 ) output.push( ' | ||||||
' + '' + '' + @@ -137,7 +197,7 @@ CKEDITOR.plugins.add( 'colorbutton', } // Render the "More Colors" button. - if ( config.colorButton_enableMore ) + if ( config.colorButton_enableMore === undefined || config.colorButton_enableMore ) { output.push( ' |