X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=04522306a7b62386724865180e4882aaa094d59f;hb=039a051ccf3901311661022a30afd60fc38130c9;hp=c87d068c38d8ee74cb33d39b68b43c42caf244a7;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git
diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index c87d068..0452230 100644
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -40,12 +40,15 @@ CKEDITOR.plugins.add( 'colorbutton',
block.autoSize = true;
block.element.addClass( 'cke_colorblock' );
block.element.setHtml( renderColors( panel, type ) );
+ // The block should not have scrollbars (#5933, #6056)
+ block.element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
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
@@ -86,13 +89,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' );
});
@@ -122,13 +137,22 @@ 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(
'' +
'' +
'' +
@@ -137,7 +161,7 @@ CKEDITOR.plugins.add( 'colorbutton',
}
// Render the "More Colors" button.
- if ( config.colorButton_enableMore )
+ if ( config.colorButton_enableMore === undefined || config.colorButton_enableMore )
{
output.push(
' |
' +
@@ -150,7 +174,7 @@ 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( '' );
@@ -162,21 +186,26 @@ CKEDITOR.plugins.add( 'colorbutton',
/**
* Whether to enable the "More Colors..." button in the color selectors.
- * @default false
+ * @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".
* @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,' +
@@ -200,13 +229,7 @@ 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 } } ]
};
/**