Ticket #3417: 3417_4.patch

_source/plugins/screenreader/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Interface to announce voice messages to screenreaders for ARIA-
+ *              compliant browsers.
+ */
+
+CKEDITOR.plugins.add( 'screenreader',
+{
+        init : function( editor )
+        {
+                editor.on( 'themeSpace', function( evt )
+                        {
+                                if ( evt.data.space != 'top' )
+                                        return;
+
+                                evt.data.html += '<ul style="position:absolute;left:-10000px;list-style-type:none;"' +
+                                        ' role="log" aria-live="rude" aria-relevant="additions" aria-atomic="false"' +
+                                        ' id="cke_screenreader_' + editor.name + '"></ul>';
+                        } );
+        }
+} );
+
+CKEDITOR.editor.prototype.announce = function( text )
+{
+        var item = CKEDITOR.dom.element.createFromHtml( '<li>' + CKEDITOR.tools.htmlEncode( text ) + '</li>' );
+        CKEDITOR.document.getById( 'cke_screenreader_' + this.name ).append( item );
+};

_source/plugins/button/plugin.js

@@ -130 +130 @@
                                 ' class="', classes, '" href="javascript:void(\'', ( this.title || '' ).replace( "'", '' ), '\')"' +
                                 ' title="', this.title, '"' +
                                 ' tabindex="-1"' +
+                                ' role="button"' +
                                 ' hidefocus="true"' );
 
                 // Some browsers don't cancel key events in the keydown but in the

_source/plugins/toolbar/plugin.js

@@ -10 +10 @@
 
 (function()
 {
-        var toolbox = function()
+        var toolbox = function( editor )
         {
+                this.editor = editor;
                 this.toolbars = [];
                 this.focusCommandExecuted = false;
         };
@@ -24 +25 @@
                         {
                                 if ( item.focus )
                                 {
+                                        // If Firefox, announce the item's text separately. (#3417)
+                                        if ( CKEDITOR.env.gecko )
+                                                this.editor.announce( item.button.label );
+
                                         item.focus();
                                         return;
                                 }
@@ -55 +60 @@
 
         CKEDITOR.plugins.add( 'toolbar',
         {
+                requires : [ 'screenreader' ],
+
                 init : function( editor )
                 {
                         var itemKeystroke = function( item, keystroke )
@@ -110 +117 @@
                                 {
                                         if ( event.data.space == editor.config.toolbarLocation )
                                         {
-                                                editor.toolbox = new toolbox();
+                                                editor.toolbox = new toolbox( editor );
 
                                                 var output = [ '<div class="cke_toolbox"' ],
                                                         expanded =  editor.config.toolbarStartupExpanded,