' + frameLabel + '

' + - '', this.label, '' ); + '', this.label, '' ); if ( this.hasArrow ) @@ -192,5 +196,7 @@ { if ( this._.state == state ) - return; + return false; + + this._.state = state; var element = CKEDITOR.document.getById( this._.id ); @@ -199,16 +205,16 @@ { element.setState( state ); - - var htmlTitle = this.title, - unavailable = this._.editor.lang.common.unavailable, - labelElement = element.getChild( 1 ); - - if ( state == CKEDITOR.TRISTATE_DISABLED ) - htmlTitle = unavailable.replace( '%1', this.title ); - - labelElement.setHtml( htmlTitle ); - } - - this._.state = state; + state == CKEDITOR.TRISTATE_DISABLED ? + element.setAttribute( 'aria-disabled', true ) : + element.removeAttribute( 'aria-disabled' ); + + state == CKEDITOR.TRISTATE_ON ? + element.setAttribute( 'aria-pressed', true ) : + element.removeAttribute( 'aria-pressed' ); + + return true; + } + else + return false; } }; Index: /CKEditor/branches/versions/3.2.x/_source/plugins/clipboard/dialogs/paste.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/clipboard/dialogs/paste.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/clipboard/dialogs/paste.js (revision 5092) @@ -6,42 +6,92 @@ CKEDITOR.dialog.add( 'paste', function( editor ) { + var lang = editor.lang.clipboard; var isCustomDomain = CKEDITOR.env.isCustomDomain(); + function onPasteFrameLoad( win ) + { + var doc = new CKEDITOR.dom.document( win.document ), + $ = doc.$; + + doc.getById( "cke_actscrpt" ).remove(); + + CKEDITOR.env.ie ? + $.body.contentEditable = "true" : + $.designMode = "on"; + + CKEDITOR.env.ie && doc.getWindow().on( 'blur', function() + { + $.body.contentEditable = "false"; + } ); + + doc.on( "keydown", function( e ) + { + var domEvent = e.data, + key = domEvent.getKeystroke(), + processed; + + switch( key ) + { + case 27 : + this.hide(); + processed = 1; + break; + + case 9 : + case CKEDITOR.SHIFT + 9 : + this.changeFocus( true ); + processed = 1; + } + + processed && domEvent.preventDefault(); + }, this ); + + editor.fire( 'ariaWidget', new CKEDITOR.dom.element( win.frameElement ) ); + } + return { - title : editor.lang.clipboard.title, + title : lang.title, minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 370 : 350, minHeight : CKEDITOR.env.quirks ? 250 : 245, - htmlToLoad : '', - onShow : function() { - if ( CKEDITOR.env.ie ) - this.getParentEditor().document.getBody().$.contentEditable = 'false'; - // FIREFOX BUG: Force the browser to render the dialog to make the to-be- // inserted iframe editable. (#3366) this.parts.dialog.$.offsetHeight; - var container = this.getContentElement( 'general', 'editing_area' ).getElement(), - iframe = CKEDITOR.dom.element.createFromHtml( '' ); + var htmlToLoad = '' + + ''; + + var iframe = CKEDITOR.dom.element.createFromHtml( + '' ); - var lang = this.getParentEditor().lang; + iframe.on( 'load', function( e ) + { + e.removeListener(); + var doc = iframe.getFrameDocument().$; + // Custom domain handling is needed after each document.open(). + doc.open(); + if ( isCustomDomain ) + doc.domain = document.domain; + doc.write( htmlToLoad ); + doc.close(); + }, this ); iframe.setStyles( @@ -54,46 +104,16 @@ iframe.setCustomData( 'dialog', this ); - var accTitle = lang.editorTitle.replace( '%1', lang.clipboard.title ); + var field = this.getContentElement( 'general', 'editing_area' ), + container = field.getElement(); + container.setHtml( '' ); + container.append( iframe ); + field.getInputElement = function(){ return iframe; }; + + // Force container to scale in IE. if ( CKEDITOR.env.ie ) - container.setHtml( '' - + CKEDITOR.tools.htmlEncode( accTitle ) - + '' ); - else { - container.setHtml( '' ); - container.setAttributes( - { - role : 'region', - title : accTitle - } ); - iframe.setAttributes( - { - role : 'region', - title : ' ' - } ); - } - container.append( iframe ); - if ( CKEDITOR.env.ie ) + container.setStyle( 'display', 'block' ); container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' ); - - if ( isCustomDomain ) - { - CKEDITOR._cke_htmlToLoad = this.definition.htmlToLoad; - iframe.setAttribute( 'src', - 'javascript:void( (function(){' + - 'document.open();' + - 'document.domain="' + document.domain + '";' + - 'document.write( window.parent.CKEDITOR._cke_htmlToLoad );' + - 'delete window.parent.CKEDITOR._cke_htmlToLoad;' + - 'document.close();' + - '})() )' ); - } - else - { - var doc = iframe.$.contentWindow.document; - doc.open(); - doc.write( this.definition.htmlToLoad ); - doc.close(); } }, @@ -132,10 +152,10 @@ type : 'html', id : 'securityMsg', - html : '

' + editor.lang.clipboard.securityMsg + '

' + html : '

' + lang.securityMsg + '

' }, { type : 'html', id : 'pasteMsg', - html : '

'+editor.lang.clipboard.pasteMsg +'

' + html : '

'+lang.pasteMsg +'

' }, { @@ -143,12 +163,9 @@ id : 'editing_area', style : 'width: 100%; height: 100%;', - html : '

', + html : '', focus : function() { - var div = this.getElement(); - var iframe = div.getElementsByTag( 'iframe' ); - if ( iframe.count() < 1 ) - return; - iframe = iframe.getItem( 0 ); + var win = this.getInputElement().$.contentWindow, + body = win && win.document.body; // #3291 : JAWS needs the 500ms delay to detect that the editor iframe @@ -157,5 +174,7 @@ setTimeout( function() { - iframe.$.contentWindow.focus(); + // Reactivate design mode for IE to make the cursor blinking. + CKEDITOR.env.ie && body && ( body.contentEditable = "true" ); + win.focus(); }, 500 ); } Index: /CKEditor/branches/versions/3.2.x/_source/plugins/colorbutton/plugin.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/colorbutton/plugin.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/colorbutton/plugin.js (revision 5092) @@ -32,10 +32,10 @@ panel : { - css : editor.skin.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' ); @@ -44,6 +44,8 @@ var keys = block.keys; keys[ 39 ] = 'next'; // ARROW-RIGHT + keys[ 40 ] = 'next'; // ARROW-DOWN keys[ 9 ] = 'next'; // TAB keys[ 37 ] = 'prev'; // ARROW-LEFT + keys[ 38 ] = 'prev'; // ARROW-UP keys[ CKEDITOR.SHIFT + 9 ] = 'prev'; // SHIFT + TAB keys[ 32 ] = 'click'; // SPACE @@ -56,5 +58,6 @@ { 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 ) @@ -99,6 +102,7 @@ ' title="', lang.auto, '"' + ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',null,\'', type, '\');return false;"' + - ' href="javascript:void(\'', lang.auto, '\')">' + - '' + + ' href="javascript:void(\'', lang.auto, '\')"' + + ' role="option" aria-posinset="1" aria-setsize="', total, '">' + + '

' + '' + '

' + @@ -111,5 +115,5 @@ '

' + '

container of the tab. - id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) ); - this.selectPage( id ); - - if ( this._.tabBarMode ) + if ( target.hasClass( 'cke_dialog_tab' ) ) { - this._.tabBarMode = false; - this._.currentFocusIndex = -1; - changeFocus( true ); + var id = target.$.id; + this.selectPage( id.substr( 0, id.lastIndexOf( '_' ) ) ); + if ( this._.tabBarMode ) + { + this._.tabBarMode = false; + this._.currentFocusIndex = -1; + changeFocus( true ); + } + evt.data.preventDefault(); } - - evt.data.preventDefault(); }, this ); @@ -454,4 +525,6 @@ this.element = element; this.focusIndex = index; + // TODO: support tabIndex for focusables. + this.tabIndex = 0; this.isFocusable = function() { @@ -811,15 +884,23 @@ // Create the HTML for the tab and the content block. var page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) ); - var tab = CKEDITOR.dom.element.createFromHtml( [ + page.setAttribute( 'role', 'tabpanel' ); + + var env = CKEDITOR.env; + var tabId = contents.id + '_' + CKEDITOR.tools.getNextNumber(), + tab = CKEDITOR.dom.element.createFromHtml( [ ' 0 ? ' cke_last' : 'cke_first' ), titleHtml, ( !!contents.hidden ? ' style="display:none"' : '' ), - ' id="', contents.id + '_', CKEDITOR.tools.getNextNumber(), '"' + - ' href="javascript:void(0)"', - ' hidefocus="true">', + ' id="', tabId, '"', + env.gecko && env.version >= 10900 && !env.hc ? '' : ' href="javascript:void(0)"', + ' tabIndex="-1"', + ' hidefocus="true"', + ' role="tab">', contents.label, '' ].join( '' ) ); + + page.setAttribute( 'aria-labelledby', tabId ); // If only a single page exist, a different style is used in the central pane. @@ -881,4 +962,5 @@ page.hide(); } + page.setAttribute( 'aria-hidden', i != id ); } @@ -1938,5 +2020,5 @@ styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {}, attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {}, - innerHTML = ( contentsArg && contentsArg.call ? contentsArg( dialog, elementDefinition ) : contentsArg ) || '', + innerHTML = ( contentsArg && contentsArg.call ? contentsArg.call( this, dialog, elementDefinition ) : contentsArg ) || '', domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement', id = this.id = elementDefinition.id, @@ -2023,4 +2105,6 @@ if ( this.keyboardFocusable ) { + this.tabIndex = elementDefinition.tabIndex || 0; + this.focusIndex = dialog._.focusList.push( this ) - 1; this.on( 'focus', function() @@ -2770,4 +2854,13 @@ /** + * If the dialog has more than one tab, put focus into the first tab as soon as dialog is opened. + * @name CKEDITOR.config.dialog_startupFocusTab + * @type Boolean + * @default false + * @example + * config.dialog_startupFocusTab = true; + */ + +/** * The distance of magnetic borders used in moving and resizing dialogs, * measured in pixels. Index: /CKEditor/branches/versions/3.2.x/_source/plugins/dialogui/plugin.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/dialogui/plugin.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/dialogui/plugin.js (revision 5092) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -14,4 +14,5 @@ this._ || ( this._ = {} ); this._['default'] = this._.initValue = elementDefinition['default'] || ''; + this._.required = elementDefinition[ 'required' ] || false; var args = [ this._ ]; for ( var i = 1 ; i < arguments.length ; i++ ) @@ -33,4 +34,21 @@ { return new CKEDITOR.ui.dialog[elementDefinition.type]( dialog, elementDefinition, output ); + } + }, + containerBuilder = + { + build : function( dialog, elementDefinition, output ) + { + var children = elementDefinition.children, + child, + childHtmlList = [], + childObjList = []; + for ( var i = 0 ; ( i < children.length && ( child = children[i] ) ) ; i++ ) + { + var childHtml = []; + childHtmlList.push( childHtml ); + childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) ); + } + return new CKEDITOR.ui.dialog[ elementDefinition.type ]( dialog, childObjList, childHtmlList, output, elementDefinition ); } }, @@ -130,11 +148,12 @@ var html = []; if ( elementDefinition.labelLayout != 'horizontal' ) - html.push( '

', + html.push( '', elementDefinition.label, - '

', + '', '

', - contentHtml( dialog, elementDefinition ), + contentHtml.call( this, dialog, elementDefinition ), '

' ); else @@ -148,6 +167,9 @@ { type : 'html', - html : '' + CKEDITOR.tools.htmlEncode( elementDefinition.label ) + + html : '' + + CKEDITOR.tools.htmlEncode( elementDefinition.label ) + '' }, @@ -155,5 +177,5 @@ type : 'html', html : '' + - contentHtml( dialog, elementDefinition ) + + contentHtml.call( this, dialog, elementDefinition ) + '' } @@ -243,4 +265,7 @@ html.push( '>

',
+					html.push( ' <label id="', labelId, '" for="', attributes.id, '">',
 							CKEDITOR.tools.htmlEncode( elementDefinition.label ),
 							'</label>' );
@@ -386,5 +415,5 @@
 				{
 					var inputHtmlList = [], html = [],
-						commonAttributes = { 'class' : 'cke_dialog_ui_radio_item' },
+						commonAttributes = { 'class' : 'cke_dialog_ui_radio_item', 'aria-labelledby' : this._.labelId },
 						commonName = elementDefinition.id ? elementDefinition.id + '_radio' : CKEDITOR.tools.getNextNumber() + '_radio';
 					for ( var i = 0 ; i < elementDefinition.items.length ; i++ )
@@ -393,7 +422,9 @@
 							title = item[2] !== undefined ? item[2] : item[0],
 							value = item[1] !== undefined ? item[1] : item[0],
+							inputId = CKEDITOR.tools.getNextNumber() + '_radio_input',
+							labelId = inputId + '_label',
 							inputDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
 									{
-										id : CKEDITOR.tools.getNextNumber() + '_radio_input',
+										id : inputId,
 										title : null,
 										type : null
@@ -401,5 +432,4 @@
 							labelDefinition = CKEDITOR.tools.extend( {}, inputDefinition,
 									{
-										id : null,
 										title : title
 									}, true ),
@@ -409,5 +439,6 @@
 								'class' : 'cke_dialog_ui_radio_input',
 								name : commonName,
-								value : value
+								value : value,
+								'aria-labelledby' : labelId
 							},
 							inputHtml = [];
@@ -418,5 +449,5 @@
 						children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );
 						inputHtml.push( ' ' );
-						new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtml, 'label', null, { 'for' : inputAttributes.id },
+						new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtml, 'label', null, { id : labelId, 'for' : inputAttributes.id },
 							   item[0] );
 						inputHtmlList.push( inputHtml.join( '' ) );
@@ -474,4 +505,13 @@
 									evt.data.preventDefault();
 								} );
+
+							element.on( 'keydown', function( evt )
+								{
+									if ( evt.data.getKeystroke() in { 32:1, 13:1 } )
+									{
+										me.click();
+										evt.data.preventDefault();
+									}
+								} );
 						})();
 
@@ -482,4 +522,5 @@
 				delete outerDefinition.style;
 
+				var labelId = CKEDITOR.tools.getNextNumber() + '_label';
 				CKEDITOR.ui.dialog.uiElement.call(
 					this,
@@ -494,7 +535,9 @@
 						title : elementDefinition.label,
 						hidefocus : 'true',
-						'class' : elementDefinition['class']
+						'class' : elementDefinition['class'],
+						role : 'button',
+						'aria-labelledby' : labelId
 					},
-					'<span class="cke_dialog_ui_button">' +
+					'<span id="' + labelId + '" class="cke_dialog_ui_button">' +
 						CKEDITOR.tools.htmlEncode( elementDefinition.label ) +
 					'</span>' );
@@ -535,4 +578,5 @@
 					this.validate = elementDefinition.validate;
 
+				_.inputId = CKEDITOR.tools.getNextNumber() + '_select';
 				/** @ignore */
 				var innerHTML = function()
@@ -544,5 +588,5 @@
 						html = [],
 						innerHTML = [],
-						attributes = { 'class' : 'cke_dialog_ui_input_select' };
+						attributes = { 'id' : _.inputId, 'class' : 'cke_dialog_ui_input_select', 'aria-labelledby' : this._.labelId };
 
 					// Add multiple and size attributes from element definition.
@@ -724,5 +768,6 @@
 
 					// Look for focus function in definition.
-					if ( elementDefinition.focus )
+					var focus = elementDefinition.focus;
+					if ( focus )
 					{
 						var oldFocus = this.focus;
@@ -730,5 +775,5 @@
 						{
 							oldFocus.call( this );
-							elementDefinition.focus.call( this );
+							typeof focus == 'function' && focus.call( this );
 							this.fire( 'focus' );
 						};
@@ -756,5 +801,43 @@
 					htmlList.push( [ theirMatch[1], ' ', myMatch[1] || '', theirMatch[2] ].join( '' ) );
 				};
-			})()
+			})(),
+
+			/**
+			 * Form fieldset for grouping dialog UI elements.
+			 * @constructor
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @param {CKEDITOR.dialog} dialog Parent dialog object.
+			 * @param {Array} childObjList
+			 * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this
+			 * container.
+			 * @param {Array} childHtmlList
+			 * Array of HTML code that correspond to the HTML output of all the
+			 * objects in childObjList.
+			 * @param {Array} htmlList
+			 * Array of HTML code that this element will output to.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>label</strong> (Optional) The legend of the this fieldset.</li>
+			 * 	<li><strong>children</strong> (Required) An array of dialog field definitions which will be grouped inside this fieldset. </li>
+			 * </ul>
+			 */
+			fieldset : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition )
+			{
+				var legendLabel = elementDefinition.label;
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var html = [];
+					legendLabel && html.push( '<legend>' + legendLabel + '</legend>' );
+					for ( var i = 0; i < childHtmlList.length; i++ )
+						html.push( childHtmlList[ i ] );
+					return html.join( '' );
+				};
+
+				this._ = { children : childObjList };
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'fieldset', null, null, innerHTML );
+			}
+
 		}, true );
 
@@ -1310,4 +1393,6 @@
 	CKEDITOR.ui.dialog.fileButton.prototype = new CKEDITOR.ui.dialog.button;
 
+	CKEDITOR.ui.dialog.fieldset.prototype = CKEDITOR.tools.clone( CKEDITOR.ui.dialog.hbox.prototype );
+
 	CKEDITOR.dialog.addUIElement( 'text', textBuilder );
 	CKEDITOR.dialog.addUIElement( 'password', textBuilder );
@@ -1320,3 +1405,4 @@
 	CKEDITOR.dialog.addUIElement( 'fileButton', commonBuilder );
 	CKEDITOR.dialog.addUIElement( 'html', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'fieldset', containerBuilder );
 })();
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/elementspath/plugin.js	(revision 5092)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -87,4 +87,5 @@
 							extra += ' onblur="this.style.cssText = this.style.cssText;"';
 
+						var label = editor.lang.elementsPath.eleTitle.replace( /%1/, name );
 						html.unshift(
 							'<a' +
@@ -92,5 +93,5 @@
 								' href="javascript:void(\'', name, '\')"' +
 								' tabindex="-1"' +
-								' title="', editor.lang.elementsPath.eleTitle.replace( /%1/, name ), '"' +
+								' title="', label, '"' +
 								( ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ?
 								' onfocus="event.preventBubble();"' : '' ) +
@@ -98,6 +99,8 @@
 								' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', this.name, '\',', index, ', event);"' +
 								extra ,
-								' onclick="return CKEDITOR._.elementsPath.click(\'', this.name, '\',', index, ');">',
+								' onclick="return CKEDITOR._.elementsPath.click(\'', this.name, '\',', index, ');"',
+								' role="button" aria-labelledby="' + idBase + index + '_label">',
 									name,
+									'<span id="', idBase, index, '_label" class="cke_label">' + label + '</span>',
 							'</a>' );
 
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/find/dialogs/find.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/find/dialogs/find.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/find/dialogs/find.js	(revision 5092)
@@ -816,9 +816,4 @@
 				// Establish initial searching start position.
 				finder.searchRange = getSearchRange();
-
-				if ( startupPage == 'replace' )
-					this.getContentElement( 'replace', 'txtFindReplace' ).focus();
-				else
-					this.getContentElement( 'find', 'txtFindFind' ).focus();
 			},
 			onHide : function()
@@ -834,4 +829,11 @@
 				// Clear current session before dialog close
 				delete finder.matchRange;
+			},
+			onFocus : function()
+			{
+				if ( startupPage == 'replace' )
+					return this.getContentElement( 'replace', 'txtFindReplace' );
+				else
+					return this.getContentElement( 'find', 'txtFindFind' );
 			}
 		};
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/flash/dialogs/flash.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/flash/dialogs/flash.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/flash/dialogs/flash.js	(revision 5092)
@@ -301,8 +301,4 @@
 							[
 								{
-									type : 'html',
-									html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.image.url ) + '</span>'
-								},
-								{
 									type : 'hbox',
 									widths : [ '280px', '110px' ],
@@ -313,5 +309,6 @@
 											id : 'src',
 											type : 'text',
-											label : '',
+											label : editor.lang.image.url,
+											required : true,
 											validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.flash.validateSrc ),
 											setup : loadValue,
@@ -348,5 +345,7 @@
 											filebrowser : 'info:src',
 											hidden : true,
-											align : 'center',
+											// v-align with the 'src' field.
+											// TODO: We need something better than a fixed size here.
+											style : 'display:inline-block;margin-top:10px;',
 											label : editor.lang.common.browseServer
 										}
@@ -583,43 +582,46 @@
 						},
 						{
-							type : 'vbox',
-							padding : 0,
-							children :
-							[
-								{
-									type : 'html',
-									html : CKEDITOR.tools.htmlEncode( editor.lang.flash.flashvars )
-								},
-								{
-									type : 'checkbox',
-									id : 'menu',
-									label : editor.lang.flash.chkMenu,
-									'default' : true,
-									setup : loadValue,
-									commit : commitValue
-								},
-								{
-									type : 'checkbox',
-									id : 'play',
-									label : editor.lang.flash.chkPlay,
-									'default' : true,
-									setup : loadValue,
-									commit : commitValue
-								},
-								{
-									type : 'checkbox',
-									id : 'loop',
-									label : editor.lang.flash.chkLoop,
-									'default' : true,
-									setup : loadValue,
-									commit : commitValue
-								},
-								{
-									type : 'checkbox',
-									id : 'allowFullScreen',
-									label : editor.lang.flash.chkFull,
-									'default' : true,
-									setup : loadValue,
-									commit : commitValue
+							type : 'fieldset',
+							label : CKEDITOR.tools.htmlEncode( editor.lang.flash.flashvars ),
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'checkbox',
+											id : 'menu',
+											label : editor.lang.flash.chkMenu,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'play',
+											label : editor.lang.flash.chkPlay,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'loop',
+											label : editor.lang.flash.chkLoop,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'allowFullScreen',
+											label : editor.lang.flash.chkFull,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										}
+									]
 								}
 							]
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/floatpanel/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/floatpanel/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/floatpanel/plugin.js	(revision 5092)
@@ -159,8 +159,8 @@
 							// inside the window itself, so we must ensure the
 							// target is out of it.
-							var target = ev.data.getTarget(),
-								targetWindow = target.getWindow && target.getWindow();
-
-							if ( targetWindow && targetWindow.equals( focused ) )
+							var target;
+							if ( CKEDITOR.env.ie && !this.allowBlur()
+								 || ( target = ev.data.getTarget() )
+								      && target.getName && target.getName() != 'iframe' )
 								return;
 
@@ -183,7 +183,8 @@
 				}
 
-				panel.onEscape = CKEDITOR.tools.bind( function()
+				panel.onEscape = CKEDITOR.tools.bind( function( keystroke )
 					{
-						this.onEscape && this.onEscape();
+						if ( this.onEscape && this.onEscape( keystroke ) === false )
+							return false;
 					},
 					this );
@@ -272,22 +273,9 @@
 						// Set the panel frame focus, so the blur event gets fired.
 						CKEDITOR.tools.setTimeout( function()
-							{
-								if ( definition.voiceLabel )
-								{
-									if ( CKEDITOR.env.gecko )
-									{
-										var container = iframe.getParent();
-										container.setAttribute( 'role', 'region' );
-										container.setAttribute( 'title', definition.voiceLabel );
-										iframe.setAttribute( 'role', 'region' );
-										iframe.setAttribute( 'title', ' ' );
-									}
-								}
-
-								iframe.$.contentWindow.focus();
-								// We need this get fired manually because of unfired focus() function.
-								this.allowBlur( true );
-
-							}, 0, this);
+						{
+							iframe.$.contentWindow.focus();
+							// We need this get fired manually because of unfired focus() function.
+							this.allowBlur( true );
+						}, 0, this);
 					}, 0, this);
 				this.visible = 1;
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/font/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/font/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/font/plugin.js	(revision 5092)
@@ -39,12 +39,10 @@
 				label : lang.label,
 				title : lang.panelTitle,
-				voiceLabel : lang.voiceLabel,
 				className : 'cke_' + ( styleType == 'size' ? 'fontSize' : 'font' ),
-				multiSelect : false,
-
 				panel :
 				{
 					css : editor.skin.editor.css.concat( config.contentsCss ),
-					voiceLabel : lang.panelVoiceLabel
+					multiSelect : false,
+					attributes : { 'aria-label' : lang.panelTitle }
 				},
 
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/format/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/format/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/format/plugin.js	(revision 5092)
@@ -28,12 +28,10 @@
 				label : lang.label,
 				title : lang.panelTitle,
-				voiceLabel : lang.voiceLabel,
 				className : 'cke_format',
-				multiSelect : false,
-
 				panel :
 				{
 					css : editor.skin.editor.css.concat( config.contentsCss ),
-					voiceLabel : lang.panelVoiceLabel
+					multiSelect : false,
+					attributes : { 'aria-label' : lang.panelTitle }
 				},
 
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/image/dialogs/image.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/image/dialogs/image.js	(revision 5092)
@@ -147,4 +147,10 @@
 		else
 			ratioButton.addClass( 'cke_btn_unlocked' );
+
+		var lang = dialog._.editor.lang.image,
+			label =  lang[  dialog.lockRatio ? 'unlockRatio' : 'lockRatio' ];
+
+		ratioButton.setAttribute( 'title', label );
+		ratioButton.getFirst().setText( label );
 
 		return dialog.lockRatio;
@@ -461,8 +467,4 @@
 							[
 								{
-									type : 'html',
-									html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.image.url ) + '</span>'
-								},
-								{
 									type : 'hbox',
 									widths : [ '280px', '110px' ],
@@ -473,5 +475,6 @@
 											id : 'txtUrl',
 											type : 'text',
-											label : '',
+											label : editor.lang.image.url,
+											required: true,
 											onChange : function()
 											{
@@ -543,4 +546,7 @@
 											type : 'button',
 											id : 'browse',
+											// v-align with the 'txtUrl' field.
+											// TODO: We need something better than a fixed size here.
+											style : 'display:inline-block;margin-top:10px;',
 											align : 'center',
 											label : editor.lang.common.browseServer,
@@ -615,9 +621,9 @@
 																commitInternally.call( this, 'advanced:txtdlgGenStyle' );
 															},
-															validate: function()
+															validate : function()
 															{
 																var aMatch  =  this.getValue().match( regexGetSizeOrEmpty );
 																if ( !aMatch )
-																	alert( editor.lang.common.validateNumberFailed );
+																	alert( editor.lang.image.validateWidth );
 																return !!aMatch;
 															},
@@ -665,9 +671,9 @@
 																commitInternally.call( this, 'advanced:txtdlgGenStyle' );
 															},
-															validate: function()
+															validate : function()
 															{
 																var aMatch = this.getValue().match( regexGetSizeOrEmpty );
 																if ( !aMatch )
-																	alert( editor.lang.common.validateNumberFailed );
+																	alert( editor.lang.image.validateHeight );
 																return !!aMatch;
 															},
@@ -762,8 +768,8 @@
 													},
 													html : '<div>'+
-														'<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.lockRatio +
-														'" class="cke_btn_locked" id="btnLockSizes"></a>' +
+														'<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.unlockRatio +
+														'" class="cke_btn_locked" id="btnLockSizes" role="button"><span class="cke_label">' + editor.lang.image.unlockRatio + '</span></a>' +
 														'<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.resetSize +
-														'" class="cke_btn_reset" id="btnResetSize"></a>'+
+														'" class="cke_btn_reset" id="btnResetSize" role="button"><span class="cke_label">' + editor.lang.image.resetSize + '</span></a>'+
 														'</div>'
 												}
@@ -790,9 +796,5 @@
 														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
 													},
-													validate: function()
-													{
-														var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
-														return func.apply( this );
-													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateBorder ),
 													setup : function( type, element )
 													{
@@ -851,9 +853,5 @@
 														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
 													},
-													validate: function()
-													{
-														var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
-														return func.apply( this );
-													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateHSpace ),
 													setup : function( type, element )
 													{
@@ -919,9 +917,5 @@
 														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
 													},
-													validate: function()
-													{
-														var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
-														return func.apply( this );
-													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateVSpace ),
 													setup : function( type, element )
 													{
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/keystrokes/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/keystrokes/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/keystrokes/plugin.js	(revision 5092)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -215,5 +215,6 @@
 	[ CKEDITOR.CTRL + 85 /*U*/, 'underline' ],
 
-	[ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ]
+	[ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ],
+	[ CKEDITOR.ALT + 48 /*0*/, 'a11yHelp' ]
 ];
 
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/anchor.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/anchor.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/anchor.js	(revision 5092)
@@ -82,4 +82,5 @@
 						id : 'txtName',
 						label : editor.lang.anchor.name,
+						required: true,
 						validate : function()
 						{
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js	(revision 5092)
@@ -437,4 +437,5 @@
 										id : 'url',
 										label : editor.lang.common.url,
+										required: true,
 										onLoad : function ()
 										{
@@ -485,8 +486,4 @@
 												this.setValue( data.url.url );
 											this.allowOnChange = true;
-
-											var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
-											if ( linkType && linkType.getValue() == 'url' )
-												this.select();
 
 										},
@@ -529,7 +526,7 @@
 						[
 							{
-								type : 'html',
+								type : 'fieldset',
 								id : 'selectAnchorText',
-								html : CKEDITOR.tools.htmlEncode( editor.lang.link.selectAnchor ),
+								label : editor.lang.link.selectAnchor,
 								setup : function( data )
 								{
@@ -538,5 +535,88 @@
 									else
 										this.getElement().hide();
-								}
+								},
+								children :
+								[
+									{
+										type : 'hbox',
+										id : 'selectAnchor',
+										children :
+										[
+											{
+												type : 'select',
+												id : 'anchorName',
+												'default' : '',
+												label : editor.lang.link.anchorName,
+												style : 'width: 100%;',
+												items :
+												[
+													[ '' ]
+												],
+												setup : function( data )
+												{
+													this.clear();
+													this.add( '' );
+													for ( var i = 0 ; i < data.anchors.length ; i++ )
+													{
+														if ( data.anchors[i].name )
+															this.add( data.anchors[i].name );
+													}
+
+													if ( data.anchor )
+														this.setValue( data.anchor.name );
+
+													var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
+													if ( linkType && linkType.getValue() == 'email' )
+														this.focus();
+												},
+												commit : function( data )
+												{
+													if ( !data.anchor )
+														data.anchor = {};
+
+													data.anchor.name = this.getValue();
+												}
+											},
+											{
+												type : 'select',
+												id : 'anchorId',
+												'default' : '',
+												label : editor.lang.link.anchorId,
+												style : 'width: 100%;',
+												items :
+												[
+													[ '' ]
+												],
+												setup : function( data )
+												{
+													this.clear();
+													this.add( '' );
+													for ( var i = 0 ; i < data.anchors.length ; i++ )
+													{
+														if ( data.anchors[i].id )
+															this.add( data.anchors[i].id );
+													}
+
+													if ( data.anchor )
+														this.setValue( data.anchor.id );
+												},
+												commit : function( data )
+												{
+													if ( !data.anchor )
+														data.anchor = {};
+
+													data.anchor.id = this.getValue();
+												}
+											}
+										],
+										setup : function( data )
+										{
+											if ( data.anchors.length > 0 )
+												this.getElement().show();
+											else
+												this.getElement().hide();
+										}
+									}
+								]
 							},
 							{
@@ -544,88 +624,10 @@
 								id : 'noAnchors',
 								style : 'text-align: center;',
-								html : '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '</div>',
+								html : '<div role="label" tabIndex="-1">' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '</div>',
+								// Focus the first element defined in above html. 
+								focus : true,
 								setup : function( data )
 								{
 									if ( data.anchors.length < 1 )
-										this.getElement().show();
-									else
-										this.getElement().hide();
-								}
-							},
-							{
-								type : 'hbox',
-								id : 'selectAnchor',
-								children :
-								[
-									{
-										type : 'select',
-										id : 'anchorName',
-										'default' : '',
-										label : editor.lang.link.anchorName,
-										style : 'width: 100%;',
-										items :
-										[
-											[ '' ]
-										],
-										setup : function( data )
-										{
-											this.clear();
-											this.add( '' );
-											for ( var i = 0 ; i < data.anchors.length ; i++ )
-											{
-												if ( data.anchors[i].name )
-													this.add( data.anchors[i].name );
-											}
-
-											if ( data.anchor )
-												this.setValue( data.anchor.name );
-
-											var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
-											if ( linkType && linkType.getValue() == 'email' )
-												this.focus();
-										},
-										commit : function( data )
-										{
-											if ( !data.anchor )
-												data.anchor = {};
-
-											data.anchor.name = this.getValue();
-										}
-									},
-									{
-										type : 'select',
-										id : 'anchorId',
-										'default' : '',
-										label : editor.lang.link.anchorId,
-										style : 'width: 100%;',
-										items :
-										[
-											[ '' ]
-										],
-										setup : function( data )
-										{
-											this.clear();
-											this.add( '' );
-											for ( var i = 0 ; i < data.anchors.length ; i++ )
-											{
-												if ( data.anchors[i].id )
-													this.add( data.anchors[i].id );
-											}
-
-											if ( data.anchor )
-												this.setValue( data.anchor.id );
-										},
-										commit : function( data )
-										{
-											if ( !data.anchor )
-												data.anchor = {};
-
-											data.anchor.id = this.getValue();
-										}
-									}
-								],
-								setup : function( data )
-								{
-									if ( data.anchors.length > 0 )
 										this.getElement().show();
 									else
@@ -650,4 +652,5 @@
 								id : 'emailAddress',
 								label : editor.lang.link.emailAddress,
+								required : true,
 								validate : function()
 								{
@@ -793,143 +796,146 @@
 						[
 							{
-								type : 'html',
-								html : CKEDITOR.tools.htmlEncode( editor.lang.link.popupFeatures )
-							},
-							{
-								type : 'hbox',
+								type : 'fieldset',
+								label : editor.lang.link.popupFeatures,
 								children :
 								[
 									{
-										type : 'checkbox',
-										id : 'resizable',
-										label : editor.lang.link.popupResizable,
-										setup : setupPopupParams,
-										commit : commitPopupParams
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'resizable',
+												label : editor.lang.link.popupResizable,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+											},
+											{
+												type : 'checkbox',
+												id : 'status',
+												label : editor.lang.link.popupStatusBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									},
 									{
-										type : 'checkbox',
-										id : 'status',
-										label : editor.lang.link.popupStatusBar,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									}
-								]
-							},
-							{
-								type : 'hbox',
-								children :
-								[
-									{
-										type : 'checkbox',
-										id : 'location',
-										label : editor.lang.link.popupLocationBar,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'location',
+												label : editor.lang.link.popupLocationBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'toolbar',
+												label : editor.lang.link.popupToolbar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									},
 									{
-										type : 'checkbox',
-										id : 'toolbar',
-										label : editor.lang.link.popupToolbar,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									}
-								]
-							},
-							{
-								type : 'hbox',
-								children :
-								[
-									{
-										type : 'checkbox',
-										id : 'menubar',
-										label : editor.lang.link.popupMenuBar,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'menubar',
+												label : editor.lang.link.popupMenuBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'fullscreen',
+												label : editor.lang.link.popupFullScreen,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									},
 									{
-										type : 'checkbox',
-										id : 'fullscreen',
-										label : editor.lang.link.popupFullScreen,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									}
-								]
-							},
-							{
-								type : 'hbox',
-								children :
-								[
-									{
-										type : 'checkbox',
-										id : 'scrollbars',
-										label : editor.lang.link.popupScrollBars,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'scrollbars',
+												label : editor.lang.link.popupScrollBars,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'dependent',
+												label : editor.lang.link.popupDependent,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									},
 									{
-										type : 'checkbox',
-										id : 'dependent',
-										label : editor.lang.link.popupDependent,
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									}
-								]
-							},
-							{
-								type : 'hbox',
-								children :
-								[
-									{
-										type :  'text',
-										widths : [ '30%', '70%' ],
-										labelLayout : 'horizontal',
-										label : editor.lang.link.popupWidth,
-										id : 'width',
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
+										type : 'hbox',
+										children :
+										[
+											{
+												type :  'text',
+												widths : [ '30%', '70%' ],
+												labelLayout : 'horizontal',
+												label : editor.lang.link.popupWidth,
+												id : 'width',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												widths : [ '55%', '45%' ],
+												label : editor.lang.link.popupLeft,
+												id : 'left',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									},
 									{
-										type :  'text',
-										labelLayout : 'horizontal',
-										widths : [ '55%', '45%' ],
-										label : editor.lang.link.popupLeft,
-										id : 'left',
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									}
-								]
-							},
-							{
-								type : 'hbox',
-								children :
-								[
-									{
-										type :  'text',
-										labelLayout : 'horizontal',
-										widths : [ '30%', '70%' ],
-										label : editor.lang.link.popupHeight,
-										id : 'height',
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
-									},
-									{
-										type :  'text',
-										labelLayout : 'horizontal',
-										label : editor.lang.link.popupTop,
-										widths : [ '55%', '45%' ],
-										id : 'top',
-										setup : setupPopupParams,
-										commit : commitPopupParams
-
+										type : 'hbox',
+										children :
+										[
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												widths : [ '30%', '70%' ],
+												label : editor.lang.link.popupHeight,
+												id : 'height',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												label : editor.lang.link.popupTop,
+												widths : [ '55%', '45%' ],
+												id : 'top',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
 									}
 								]
@@ -1374,4 +1380,15 @@
 				this.hidePage( 'target' );		//Hide Target tab.
 
+		},
+		// Inital focus on 'url' field if link is of type URL.
+		onFocus : function()
+		{
+			var linkType = this.getContentElement( 'info', 'linkType' ),
+					urlField;
+			if ( linkType && linkType.getValue( ) == 'url' )
+			{
+				urlField = this.getContentElement( 'info', 'url' );
+				urlField.select();
+			}
 		}
 	};
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/listblock/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/listblock/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/listblock/plugin.js	(revision 5092)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -10,7 +10,7 @@
 	onLoad : function()
 	{
-		CKEDITOR.ui.panel.prototype.addListBlock = function( name, multiSelect )
+		CKEDITOR.ui.panel.prototype.addListBlock = function( name, definiton )
 		{
-			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), multiSelect ) );
+			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definiton ) );
 		};
 
@@ -19,10 +19,16 @@
 				base : CKEDITOR.ui.panel.block,
 
-				$ : function( blockHolder, multiSelect )
+				$ : function( blockHolder, blockDefinition )
 				{
+					blockDefinition = blockDefinition || {};
+
+					var attribs = blockDefinition.attributes || ( blockDefinition.attributes = {} );
+					( this.multiSelect = !!blockDefinition.multiSelect ) &&
+						( attribs[ 'aria-multiselectable' ] = true );
+					// Provide default role of 'listbox'.
+					!attribs.role && ( attribs.role = 'listbox' );
+					
 					// Call the base contructor.
-					this.base( blockHolder );
-
-					this.multiSelect = !!multiSelect;
+					this.base.apply( this, arguments );
 
 					var keys = this.keys;
@@ -80,6 +86,7 @@
 						if ( !this._.started )
 						{
-							pendingHtml.push( '<ul class=cke_panel_list>' );
+							pendingHtml.push( '<ul role="presentation" class=cke_panel_list>' );
 							this._.started = 1;
+							this._.size = this._.size || 0;
 						}
 
@@ -88,8 +95,10 @@
 						pendingHtml.push(
 							'<li id=', id, ' class=cke_panel_listItem>' +
-								'<a _cke_focus=1 hidefocus=true' +
+								'<a id="', id, '_option" _cke_focus=1 hidefocus=true' +
 									' title="', title || value, '"' +
 									' href="javascript:void(\'', value, '\')"' +
-									' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;">',
+									' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
+									' role="option"' +
+									' aria-posinset="' + ++this._.size + '">',
 									html || value,
 								'</a>' +
@@ -105,5 +114,5 @@
 						this._.groups[ title ] = id;
 
-						this._.pendingHtml.push( '<h1 id=', id, ' class=cke_panel_grouptitle>', title, '</h1>' );
+						this._.pendingHtml.push( '<h1 role="presentation" id=', id, ' class=cke_panel_grouptitle>', title, '</h1>' );
 					},
 
@@ -112,4 +121,11 @@
 						this._.close();
 						this.element.appendHtml( this._.pendingHtml.join( '' ) );
+
+						var items = this._.items,
+							doc = this.element.getDocument();
+						for ( var value in items )
+							doc.getById( items[ value ] + '_option' ).setAttribute( 'aria-setsize', this._.size );
+						delete this._.size;
+
 						this._.pendingHtml = [];
 					},
@@ -174,5 +190,10 @@
 							this.unmarkAll();
 
-						this.element.getDocument().getById( this._.items[ value ] ).addClass( 'cke_selected' );
+						var itemId = this._.items[ value ],
+							item = this.element.getDocument().getById( itemId );
+						item.addClass( 'cke_selected' );
+
+						this.element.getDocument().getById( itemId + '_option' ).setAttribute( 'aria-selected', true );
+						this.element.setAttribute( 'aria-activedescendant', itemId + '_option' );
 					},
 
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/menu/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/menu/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/menu/plugin.js	(revision 5092)
@@ -47,6 +47,7 @@
 	CKEDITOR.menu = CKEDITOR.tools.createClass(
 	{
-		$ : function( editor, level )
+		$ : function( editor, definition )
 		{
+			definition = this._.definition = definition || {};
 			this.id = 'cke_' + CKEDITOR.tools.getNextNumber();
 
@@ -54,5 +55,17 @@
 			this.items = [];
 
-			this._.level = level || 1;
+			this._.level = definition.level || 1;
+
+			var panelDefinition = CKEDITOR.tools.extend( {}, definition.panel,
+			{
+				css : editor.skin.editor.css,
+				level : this._.level - 1,
+				block : {}
+			} );
+
+			var attrs = panelDefinition.block.attributes = ( panelDefinition.attributes || {} );
+			// Provide default role of 'menu'.
+			!attrs.role && ( attrs.role = 'menu' );
+			this._.panelDefinition = panelDefinition;
 		},
 
@@ -72,4 +85,8 @@
 					return;
 				}
+
+				// Record parent menu focused item first (#3389).
+				var block = this._.panel.getBlock( this.id );
+				block._.focusIndex = index;
 
 				// Create the submenu, if not available, or clean the existing
@@ -79,7 +96,10 @@
 				else
 				{
-					menu = this._.subMenu = new CKEDITOR.menu( this.editor, this._.level + 1 );
+					menu = this._.subMenu = new CKEDITOR.menu( this.editor,
+								   CKEDITOR.tools.extend( {}, this._.definition, { level : this._.level + 1 }, true ) );
 					menu.parent = this;
 					menu.onClick = CKEDITOR.tools.bind( this.onClick, this );
+					// Sub menu use their own scope for binding onEscape.
+					menu.onEscape = this.onEscape;
 				}
 
@@ -131,16 +151,13 @@
 				if ( !panel )
 				{
-					panel = this._.panel = new CKEDITOR.ui.floatPanel( this.editor, CKEDITOR.document.getBody(),
-						{
-							css : editor.skin.editor.css,
-							level : this._.level - 1,
-							className : editor.skinClass + ' cke_contextmenu'
-						},
-						this._.level);
-
-					panel.onEscape = CKEDITOR.tools.bind( function()
+					panel = this._.panel = new CKEDITOR.ui.floatPanel( this.editor,
+						CKEDITOR.document.getBody(),
+						this._.panelDefinition,
+						this._.level );
+
+					panel.onEscape = CKEDITOR.tools.bind( function( keystroke )
 					{
-						this.onEscape && this.onEscape();
-						this.hide();
+						if ( this.onEscape && this.onEscape( keystroke ) === false )
+							return false;
 					},
 					this );
@@ -153,5 +170,5 @@
 
 					// Create an autosize block inside the panel.
-					var block = panel.addBlock( this.id );
+					var block = panel.addBlock( this.id, this._.panelDefinition.block );
 					block.autoSize = true;
 
@@ -162,5 +179,5 @@
 					keys[ CKEDITOR.SHIFT + 9 ]	= 'prev';	// SHIFT + TAB
 					keys[ 32 ]	= 'click';					// SPACE
-					keys[ 39 ]	= 'click';					// ARROW-RIGHT
+					keys[ ( editor.lang.dir == 'rtl' ? 37 : 39 ) ]	= 'click';  // ARROW-RIGHT/ARROW-LEFT(rtl)
 
 					element = this._.element = block.element;
@@ -291,9 +308,9 @@
 
 			var htmlLabel = this.label;
-			if ( state == CKEDITOR.TRISTATE_DISABLED )
-				htmlLabel = this.editor.lang.common.unavailable.replace( '%1', htmlLabel );
 
 			if ( this.className )
 				classes += ' ' + this.className;
+
+			var hasSubMenu = this.getItems;
 
 			output.push(
@@ -304,5 +321,9 @@
 					' tabindex="-1"' +
 					'_cke_focus=1' +
-					' hidefocus="true"' );
+					' hidefocus="true"' +
+					' role="menuitem"' +
+					( hasSubMenu ? 'aria-haspopup="true"' : '' ) +
+					( state == CKEDITOR.TRISTATE_DISABLED ? 'aria-disabled="true"' : '' ) +
+					( state == CKEDITOR.TRISTATE_ON ? 'aria-pressed="true"' : '' ) );
 
 			// Some browsers don't cancel key events in the keydown but in the
@@ -336,5 +357,5 @@
 						'<span class="cke_label">' );
 
-			if ( this.getItems )
+			if ( hasSubMenu )
 			{
 				output.push(
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js	(revision 5092)
@@ -97,5 +97,5 @@
 						'<iframe id="', id, '_frame"' +
 							' frameborder="0"' +
-							' src="javascript:void(' );
+							' role="application" src="javascript:void(' );
 
 			output.push(
@@ -156,6 +156,5 @@
 						'</head>' +
 						'<body class="cke_' + dir + ' cke_panel_frame ' + CKEDITOR.env.cssClass + '" style="margin:0;padding:0"' +
-						' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');">' +
-						'</body>' +
+						' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');"></body>' +
 						// It looks strange, but for FF2, the styles must go
 						// after <body>, so it (body) becames immediatelly
@@ -172,5 +171,6 @@
 				doc.on( 'keydown', function( evt )
 					{
-						var keystroke = evt.data.getKeystroke();
+						var keystroke = evt.data.getKeystroke(),
+							dir = this.document.getById( 'cke_' + this.id ).getAttribute( 'dir' );
 
 						// Delegate key processing to block.
@@ -181,6 +181,10 @@
 						}
 
-						if ( keystroke == 27 )		// ESC
-							this.onEscape && this.onEscape();
+						// ESC/ARROW-LEFT(ltr) OR ARROW-RIGHT(rtl)
+						if ( keystroke == 27 || keystroke == ( dir == 'rtl' ? 39 : 37 ) )
+						{
+							if ( this.onEscape && this.onEscape( keystroke ) === false )
+								evt.data.preventDefault( );
+						}
 					},
 					this );
@@ -199,5 +203,6 @@
 	addBlock : function( name, block )
 	{
-		block = this._.blocks[ name ] = block || new CKEDITOR.ui.panel.block( this.getHolderElement() );
+		block = this._.blocks[ name ] = block instanceof CKEDITOR.ui.panel.block ?  block
+				: new CKEDITOR.ui.panel.block( this.getHolderElement(), block );
 
 		if ( !this._.currentBlock )
@@ -216,10 +221,20 @@
 		var blocks = this._.blocks,
 			block = blocks[ name ],
-			current = this._.currentBlock;
+			current = this._.currentBlock,
+			holder = this.forceIFrame ?
+				this.document.getById( 'cke_' + this.id + '_frame' )
+				: this._.holder;
 
 		if ( current )
+		{
+			// Clean up the current block's effects on holder.
+			holder.removeAttributes( current.attributes );
 			current.hide();
+		}
 
 		this._.currentBlock = block;
+
+		holder.setAttributes( block.attributes );
+		CKEDITOR.fire( 'ariaWidget', holder );
 
 		// Reset the focus index, so it will always go into the first one.
@@ -241,5 +256,5 @@
 CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
 {
-	$ : function( blockHolder )
+	$ : function( blockHolder, blockDefinition )
 	{
 		this.element = blockHolder.append(
@@ -248,4 +263,5 @@
 					attributes :
 					{
+						'tabIndex' : -1,
 						'class' : 'cke_panel_block'
 					},
@@ -256,4 +272,8 @@
 				}) );
 
+		// Copy all definition properties to this object.
+		if ( blockDefinition )
+			CKEDITOR.tools.extend( this, blockDefinition );
+
 		this.keys = {};
 
@@ -264,5 +284,23 @@
 	},
 
-	_ : {},
+	_ : {
+		
+		/**
+		 * Mark the item specified by the index as current activated. 
+		 */
+		markItem: function( index )
+		{
+			if ( index == -1 )
+				return;
+			var links = this.element.getElementsByTag( 'a' );
+			var item = links.getItem( this._.focusIndex = index );
+
+			// Safari need focus on the iframe window first(#3389), but we need
+			// lock the blur to avoid hiding the panel.
+			if ( CKEDITOR.env.webkit )
+				item.getDocument().getWindow().focus();
+			item.focus();
+		}
+	},
 
 	proto :
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/panelbutton/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/panelbutton/plugin.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/panelbutton/plugin.js	(revision 5092)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -58,4 +58,9 @@
 							|| CKEDITOR.document;
 
+			panelDefinition.block =
+			{
+				attributes : panelDefinition.attributes
+			};
+
 			this.hasArrow = true;
 
@@ -89,6 +94,8 @@
 
 				var panelDefinition = this._.panelDefinition || {},
+					 panelBlockDefinition = this._.panelDefinition.block,
 					panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(),
 					panel = this._.panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ),
+					block = panel.addBlock( _.id, panelBlockDefinition ),
 					me = this;
 
@@ -127,7 +134,7 @@
 
 				if ( this.onBlock )
-					this.onBlock( panel, _.id );
+					this.onBlock( panel, block );
 
-				panel.getBlock( _.id ).onHide = function()
+				block.onHide = function()
 						{
 								_.on = 0;
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/pastetext/dialogs/pastetext.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/pastetext/dialogs/pastetext.js	(revision 5091)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/pastetext/dialogs/pastetext.js	(revision 5092)
@@ -56,4 +56,13 @@
 										'background-color:white">' +
 									'

', + + onLoad : function() + { + var label = this.getDialog().getContentElement( 'general', 'pasteMsg' ).getElement(), + input = this.getElement(); + + input.setAttribute( 'aria-labelledby', label.$.id ); + }, + focus : function() { Index: /CKEditor/branches/versions/3.2.x/_source/plugins/richcombo/plugin.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/richcombo/plugin.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/richcombo/plugin.js (revision 5092) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -45,4 +45,9 @@ panelDefinition.className = ( panelDefinition.className || '' ) + ' cke_rcombopanel'; + panelDefinition.block = + { + multiSelect : panelDefinition.multiSelect, + attributes : panelDefinition.attributes + }; this._ = @@ -84,4 +89,6 @@ render : function( editor, output ) { + var env = CKEDITOR.env; + var id = 'cke_' + this.id; var clickFn = CKEDITOR.tools.addFunction( function( $element ) @@ -163,7 +170,9 @@ output.push( - '>' + - '', this.label, '' + - '', + '', this.label, '', + '= 10900 && !env.hc ? '' : ' href="javascript:void(\'' + this.label + '\')"', + ' role="button" aria-labelledby="', id , '_label" aria-describedby="', id, '_text" aria-haspopup="true"' ); // Some browsers don't cancel key events in the keydown but in the @@ -188,8 +197,7 @@ ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' + '' + - '' + ( this.voiceLabel ? this.voiceLabel + ' ' : '' ) + '' + '' + this.label + '' + '' + - '' + + '' + ( CKEDITOR.env.hc ? '▼' : '' ) + '' + // BLACK DOWN-POINTING TRIANGLE '' + '' + @@ -206,9 +214,10 @@ if ( this._.panel ) return; - + var panelDefinition = this._.panelDefinition, + panelBlockDefinition = this._.panelDefinition.block, panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(), panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ), - list = panel.addListBlock( this.id, this.multiSelect ), + list = panel.addListBlock( this.id, panelBlockDefinition ), me = this; @@ -291,4 +300,5 @@ else textElement.removeClass( 'cke_inline_label' ); + textElement.setHtml( typeof text != 'undefined' ? text : value ); }, Index: /CKEditor/branches/versions/3.2.x/_source/plugins/smiley/dialogs/smiley.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/smiley/dialogs/smiley.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/smiley/dialogs/smiley.js (revision 5092) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -7,4 +7,5 @@ { var config = editor.config, + lang = editor.lang.smiley, images = config.smiley_images, columns = 8, @@ -57,24 +58,4 @@ switch ( keystroke ) { - // RIGHT-ARROW - case 39 : - // relative is TD - if ( ( relative = element.getParent().getNext() ) ) - { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - } - ev.preventDefault(); - break; - // LEFT-ARROW - case 37 : - // relative is TD - if ( ( relative = element.getParent().getPrevious() ) ) - { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - } - ev.preventDefault(); - break; // UP-ARROW case 38 : @@ -104,4 +85,7 @@ ev.preventDefault(); break; + + // RIGHT-ARROW + case 39 : // TAB case 9 : @@ -122,4 +106,7 @@ } break; + + // LEFT-ARROW + case 37 : // SHIFT + TAB case CKEDITOR.SHIFT + 9 : @@ -148,10 +135,13 @@ var html = [ - '' + + '' + lang.smileyEmotionsLabel +'', + '

' ]; - for ( i = 0 ; i < images.length ; i++ ) + var size = images.length; + for ( i = 0 ; i < size ; i++ ) { if ( i % columns === 0 ) @@ -160,5 +150,9 @@ html.push( '' ); @@ -181,5 +176,5 @@ } - html.push( '' ); + html.push( '

' + editor.lang.common.options +'

' + editor.lang.table.widthPx + '

' + template.title + '
'; - - if( template.description ) - html += '' + template.description + ''; - - html += '

' + template.title + '
'; + + if ( template.description ) + html += '' + template.description + ''; + + html += '

' + + '' + '

' + editor.lang.common.options+ '

' + '' + editor.lang.templates.emptyListMsg + '' + @@ -175,4 +211,11 @@ } }); + + this._.element.on( 'keydown', keyNavigation ); + }, + + onHide : function () + { + this._.element.removeListener( 'keydown', keyNavigation ); } }; Index: /CKEditor/branches/versions/3.2.x/_source/plugins/toolbar/plugin.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/plugins/toolbar/plugin.js (revision 5091) +++ /CKEditor/branches/versions/3.2.x/_source/plugins/toolbar/plugin.js (revision 5092) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -60,11 +60,34 @@ var itemKeystroke = function( item, keystroke ) { + var next, nextToolGroup, groupItemsCount; + switch ( keystroke ) { case 39 : // RIGHT-ARROW case 9 : // TAB - // Look for the next item in the toolbar. - while ( ( item = item.next || ( item.toolbar.next && item.toolbar.next.items[ 0 ] ) ) && !item.focus ) - { /*jsl:pass*/ } + do + { + // Look for the previous item in the toolbar. + next = item.next; + + if( !next ) + { + nextToolGroup = item.toolbar.next; + groupItemsCount = nextToolGroup && nextToolGroup.items.length; + + // Bypass the empty toolgroups. + while( groupItemsCount === 0 ) + { + nextToolGroup = nextToolGroup.next; + groupItemsCount = nextToolGroup && nextToolGroup.items.length; + } + + if( nextToolGroup ) + next = nextToolGroup.items[ 0 ]; + } + + item = next; + } + while ( item && !item.focus ) // If available, just focus it, otherwise focus the @@ -79,8 +102,29 @@ case 37 : // LEFT-ARROW case CKEDITOR.SHIFT + 9 : // SHIFT + TAB - // Look for the previous item in the toolbar. - while ( ( item = item.previous || ( item.toolbar.previous && item.toolbar.previous.items[ item.toolbar.previous.items.length - 1 ] ) ) && !item.focus ) - { /*jsl:pass*/ } - + do + { + // Look for the previous item in the toolbar. + next = item.previous; + + if( !next ) + { + nextToolGroup = item.toolbar.previous; + groupItemsCount = nextToolGroup && nextToolGroup.items.length; + + // Bypass the empty toolgroups. + while( groupItemsCount === 0 ) + { + nextToolGroup = nextToolGroup.previous; + groupItemsCount = nextToolGroup && nextToolGroup.items.length; + } + + if( nextToolGroup ) + next = nextToolGroup.items[ groupItemsCount - 1 ]; + } + + item = next; + } + while ( item && !item.focus ) + // If available, just focus it, otherwise focus the // last one. @@ -113,5 +157,5 @@ editor.toolbox = new toolbox(); - var output = [ '