radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_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( ',' ),
@@ -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',
 					'<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' +
 						'<tr>' +
 							'<td>' +
-								'<span class="cke_colorbox" style="background-color:#000"></span>' +
+								'<span class="cke_colorbox" id="', colorBoxId, '"></span>' +
 							'</td>' +
 							'<td colspan=7 align=center>',
 								lang.auto,
@@ -122,13 +173,22 @@ CKEDITOR.plugins.add( 'colorbutton',
 				if ( ( i % 8 ) === 0 )
 					output.push( '</tr><tr>' );
 
-				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 <font>. See #5676
+				if (!parts[1])
+					colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' );
+
 				var colorLabel = editor.lang.colors[ colorCode ] || colorCode;
 				output.push(
 					'<td>' +
 						'<a class="cke_colorbox" _cke_focus=1 hidefocus=true' +
 							' title="', colorLabel, '"' +
-							' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', colorCode, '\',\'', type, '\'); return false;"' +
+							' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +
 							' href="javascript:void(\'', colorLabel, '\')"' +
 							' role="option" aria-posinset="', ( i + 2 ), '" aria-setsize="', total, '">' +
 							'<span class="cke_colorbox" style="background-color:#', colorCode, '"></span>' +
@@ -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(
 					'</tr>' +
@@ -150,33 +210,45 @@ CKEDITOR.plugins.add( 'colorbutton',
 								' role="option" aria-posinset="', total, '" aria-setsize="', total, '">',
 								lang.more,
 							'</a>' +
-						'</td>' );	// It is later in the code.
+						'</td>' );	// tr is later in the code.
 			}
 
 			output.push( '</tr></table>' );
 
 			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 +259,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 +273,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.

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/colordialog/dialogs/colordialog.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
 */
 
@@ -14,41 +14,173 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 		// Reference the dialog.
 		var dialog;
 
-		function spacer()
+		var spacer =
 		{
-			return {
-				type : 'html',
-				html : ' '
-			};
+			type : 'html',
+			html : ' '
+		};
+
+		function clearSelected()
+		{
+			$doc.getById( selHiColorId ).removeStyle( 'background-color' );
+			dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' );
 		}
 
-		var table = new $el( 'table' );
-		createColorTable();
+		function updateSelected( evt )
+		{
+			if ( ! ( evt instanceof CKEDITOR.dom.event ) )
+				evt = new CKEDITOR.dom.event( evt );
 
-		var cellMouseover = function( event )
+			var target = evt.getTarget(),
+				color;
+
+			if ( target.getName() == 'a' && ( color = target.getChild( 0 ).getHtml() ) )
+				dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color );
+		}
+
+		function updateHighlight( event )
 		{
-			var color = new $el( event.data.getTarget() ).getAttribute( 'title' );
-			$doc.getById( 'hicolor' ).setStyle( 'background-color', color );
-			$doc.getById( 'hicolortext' ).setHtml( color );
-		};
+			if ( ! ( event instanceof CKEDITOR.dom.event ) )
+				event = event.data;
 
-		var cellClick = function( event )
+			var target = event.getTarget(),
+					color;
+
+			if ( target.getName() == 'a' && ( color = target.getChild( 0 ).getHtml() ) )
+			{
+				$doc.getById( hicolorId ).setStyle( 'background-color', color );
+				$doc.getById( hicolorTextId ).setHtml( color );
+			}
+		}
+
+		function clearHighlight()
 		{
-			var color = new $el( event.data.getTarget() ).getAttribute( 'title' );
-			dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color );
-		};
+			$doc.getById( hicolorId ).removeStyle( 'background-color' );
+			$doc.getById( hicolorTextId ).setHtml( ' ' );
+		}
+
+		var onMouseout = $tools.addFunction( clearHighlight ),
+			onClick = updateSelected,
+			onClickHandler = CKEDITOR.tools.addFunction( onClick ),
+			onFocus = updateHighlight,
+			onBlur = clearHighlight;
+
+		var onKeydownHandler = CKEDITOR.tools.addFunction( function( ev )
+		{
+			ev = new CKEDITOR.dom.event( ev );
+			var element = ev.getTarget();
+			var relative, nodeToMove;
+			var keystroke = ev.getKeystroke(),
+				rtl = editor.lang.dir == 'rtl';
+
+			switch ( keystroke )
+			{
+				// UP-ARROW
+				case 38 :
+					// relative is TR
+					if ( ( relative = element.getParent().getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getChild( [element.getParent().getIndex(), 0] );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+					}
+					ev.preventDefault();
+					break;
+				// DOWN-ARROW
+				case 40 :
+					// relative is TR
+					if ( ( relative = element.getParent().getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( [ element.getParent().getIndex(), 0 ] );
+						if ( nodeToMove && nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+						}
+					}
+					ev.preventDefault();
+					break;
+				// SPACE
+				// ENTER is already handled as onClick
+				case 32 :
+					onClick( ev );
+					ev.preventDefault();
+					break;
+
+				// RIGHT-ARROW
+				case rtl ? 37 : 39 :
+					// relative is TD
+					if ( ( relative = element.getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( 0 );
+						if ( nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+							ev.preventDefault( true );
+						}
+						else
+							onBlur( null, element );
+					}
+					// relative is TR
+					else if ( ( relative = element.getParent().getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( [ 0, 0 ] );
+						if ( nodeToMove && nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+							ev.preventDefault( true );
+						}
+						else
+							onBlur( null, element );
+					}
+					break;
+
+				// LEFT-ARROW
+				case rtl ? 39 : 37 :
+					// relative is TD
+					if ( ( relative = element.getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getChild( 0 );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+						ev.preventDefault( true );
+					}
+					// relative is TR
+					else if ( ( relative = element.getParent().getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getLast().getChild( 0 );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+						ev.preventDefault( true );
+					}
+					else
+						onBlur( null, element );
+					break;
+				default :
+					// Do not stop not handled events.
+					return;
+			}
+		});
 
 		function createColorTable()
 		{
 			// Create the base colors array.
-			var aColors = ['00','33','66','99','cc','ff'];
+			var aColors = [ '00', '33', '66', '99', 'cc', 'ff' ];
 
 			// This function combines two ranges of three values from the color array into a row.
 			function appendColorRow( rangeA, rangeB )
 			{
 				for ( var i = rangeA ; i < rangeA + 3 ; i++ )
 				{
-					var row = table.$.insertRow(-1);
+					var row = table.$.insertRow( -1 );
 
 					for ( var j = rangeB ; j < rangeB + 3 ; j++ )
 					{
@@ -70,8 +202,15 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 				cell.setStyle( 'width', '15px' );
 				cell.setStyle( 'height', '15px' );
 
-				// Pass unparsed color value in some markup-degradable form.
-				cell.setAttribute( 'title', color );
+				var index = cell.$.cellIndex + 1 + 18 * targetRow.rowIndex;
+				cell.append( CKEDITOR.dom.element.createFromHtml(
+						'<a href="javascript: void(0);" role="option"' +
+						' aria-posinset="' + index + '"' +
+						' aria-setsize="' + 13 * 18 + '"' +
+						' style="cursor: pointer;display:block;width:100%;height:100% " title="'+ CKEDITOR.tools.htmlEncode( color )+ '"' +
+						' onkeydown="CKEDITOR.tools.callFunction( ' + onKeydownHandler + ', event, this )"' +
+						' onclick="CKEDITOR.tools.callFunction(' + onClickHandler + ', event, this ); return false;"' +
+						' tabindex="-1"><span class="cke_voice_label">' + color + '</span>&nbsp;</a>', CKEDITOR.document ) );
 			}
 
 			appendColorRow( 0, 0 );
@@ -95,17 +234,18 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 			}
 		}
 
-		function clear()
-		{
-			$doc.getById( 'selhicolor' ).removeStyle( 'background-color' );
-			dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' );
-		}
+		var table = new $el( 'table' );
+		createColorTable();
+		var html = table.getHtml();
 
-		var clearActual = $tools.addFunction( function()
-		{
-			$doc.getById( 'hicolor' ).removeStyle( 'background-color' );
-			$doc.getById( 'hicolortext' ).setHtml( '&nbsp;' );
-		} );
+		var numbering = function( id )
+			{
+				return CKEDITOR.tools.getNextId() + '_' + id;
+			},
+			hicolorId = numbering( 'hicolor' ),
+			hicolorTextId = numbering( 'hicolortext' ),
+			selHiColorId = numbering( 'selhicolor' ),
+			tableLabelId = numbering( 'color_table_label' );
 
 		return {
 			title : lang.title,
@@ -131,15 +271,23 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 							[
 								{
 									type : 'html',
-									html : '<table onmouseout="CKEDITOR.tools.callFunction( ' + clearActual + ' );">' + table.getHtml() + '</table>',
+									html :	'<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' +
+											( !CKEDITOR.env.webkit ? html : '' ) +
+										'</table><span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',
 									onLoad : function()
 									{
 										var table = CKEDITOR.document.getById( this.domId );
-										table.on( 'mouseover', cellMouseover );
-										table.on( 'click', cellClick );
+										table.on( 'mouseover', updateHighlight );
+										// In WebKit, the table content must be inserted after this event call (#6150)
+										CKEDITOR.env.webkit && table.setHtml( html );
+									},
+									focus: function()
+									{
+										var firstColor = this.getElement().getElementsByTag( 'a' ).getItem( 0 );
+										firstColor.focus();
 									}
 								},
-								spacer(),
+								spacer,
 								{
 									type : 'vbox',
 									padding : 0,
@@ -149,13 +297,14 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 										{
 											type : 'html',
 											html : '<span>' + lang.highlight +'</span>\
-												<div id="hicolor" style="border: 1px solid; height: 74px; width: 74px;"></div>\
-												<div id="hicolortext">&nbsp;</div>\
-												<span>' + lang.selected +'</span>\
-												<div id="selhicolor" style="border: 1px solid; height: 20px; width: 74px;"></div>'
+												<div id="' + hicolorId + '" style="border: 1px solid; height: 74px; width: 74px;"></div>\
+												<div id="' + hicolorTextId + '">&nbsp;</div><span>' + lang.selected + '</span>\
+												<div id="' + selHiColorId + '" style="border: 1px solid; height: 20px; width: 74px;"></div>'
 										},
 										{
 											type : 'text',
+											label : lang.selected,
+											labelStyle: 'display:none',
 											id : 'selectedColor',
 											style : 'width: 74px',
 											onChange : function()
@@ -163,21 +312,21 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 												// Try to update color preview with new value. If fails, then set it no none.
 												try
 												{
-													$doc.getById( 'selhicolor' ).setStyle( 'background-color', this.getValue() );
+													$doc.getById( selHiColorId ).setStyle( 'background-color', this.getValue() );
 												}
 												catch ( e )
 												{
-													clear();
+													clearSelected();
 												}
 											}
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'button',
 											id : 'clear',
 											style : 'margin-top: 5px',
 											label : lang.clear,
-											onClick : clear
+											onClick : clearSelected
 										}
 									]
 								}