#10361: Stabilized the listbox announcement on JAWS by moving the ARIA role to the inner element.

fredck · fredck · commit f48fc5c23729 · 2013-06-03T12:07:37.000+02:00
diff --git a/plugins/listblock/plugin.js b/plugins/listblock/plugin.js
@@ -37,6 +37,9 @@ CKEDITOR.plugins.add( 'listblock', {
 				// Call the base contructor.
 				this.base.apply( this, arguments );
 
+				// Set the proper a11y attributes.
+				this.element.setAttribute( 'role', attribs.role );
+
 				var keys = this.keys;
 				keys[ 40 ] = 'next'; // ARROW-DOWN
 				keys[ 9 ] = 'next'; // TAB
diff --git a/plugins/panel/plugin.js b/plugins/panel/plugin.js
@@ -70,7 +70,7 @@
 		'{frame}' +
 		'</div>' );
 
-	var frameTpl = CKEDITOR.addTemplate( 'panel-frame', '<iframe id="{id}" class="cke_panel_frame" role="application" frameborder="0" src="{src}"></iframe>' );
+	var frameTpl = CKEDITOR.addTemplate( 'panel-frame', '<iframe id="{id}" class="cke_panel_frame" role="presentation" frameborder="0" src="{src}"></iframe>' );
 
 	var frameDocTpl = CKEDITOR.addTemplate( 'panel-frame-inner', '<!DOCTYPE html>' +
 		'<html class="cke_panel_container {env}" dir="{dir}" lang="{langCode}">' +
@@ -279,8 +279,16 @@
 			if ( blockDefinition )
 				CKEDITOR.tools.extend( this, blockDefinition );
 
-			if ( !this.attributes.title )
-				this.attributes.title = this.attributes[ 'aria-label' ];
+
+			// Set the a11y attributes of this element ...
+			this.element.setAttributes({
+				'aria-label': this.attributes[ 'aria-label' ],
+				'title': this.attributes.title || this.attributes[ 'aria-label' ]
+			});
+
+			// ...  and remove them from being set in the panel main element.
+			delete this.attributes[ 'aria-label' ];
+			delete this.attributes.title;
 
 			this.keys = {};
 
