Ticket #3624: 3624.patch

_source/plugins/a11ycompat/plugin.js

@@ -12 +12 @@
         var dtd = CKEDITOR.dtd,
                 env = CKEDITOR.env;
 
-        // List of in-use ARIA roles and states. 
+        // List of in-use ARIA roles and states.
         var roles = [ 'role' ],
                  // List of roles that role type should not be announced.
                  silentRoles = { 'region' : 1 },
@@ -22 +22 @@
         function lookupARIASupport( role, tagName )
         {
                 return {
-                                'dialog' :       env.gecko && env.version >= 10900,
                                 'region' : env.gecko && env.version >= 10900
                         }[ role ];
         }
 
+        function speak( textToSpeech, manner )
+        {
+                var speaker = CKEDITOR.document.getById( 'live-region' );
+                if( !speaker )
+                {
+                        speaker = CKEDITOR.dom.element.createFromHtml(
+                                        '<span class="cke_live_region" id="live-region" ' +
+                                        'style="position: absolute; display: block; width: 0; height: 0; overflow: hidden;"' +
+                                        '>&nbsp;</span>' );
+                        CKEDITOR.document.getBody().append( speaker );
+                }
+
+                speaker.setText( textToSpeech );
+                speaker.setAttribute( 'aria-live', manner || 'rude' );
+                CKEDITOR.tools.setTimeout( function()
+                {
+                        speaker.setText( '\xa0' );
+                        speaker.setAttribute( 'aria-live', 'off' );
+                }, 500, this );
+        }
+
+        function extracAriaInfo( element )
+        {
+                var doc = element.getDocument(),
+                        role = element.getAttribute( 'role' ) || '';
+
+                var attrValue,
+                        labelText = element.getAttribute( 'aria-label' ) || ( attrValue = element.getAttribute( 'aria-labelledby' ) ) && doc.getById( attrValue ).getText() || '',
+                        descriptionText = ( attrValue = element.getAttribute( 'aria-describedby' ) ) && doc.getById( attrValue ).getText() || '',
+                        composition = [ labelText, role in silentRoles ? '' : role, descriptionText ].join( ' ' );
+
+                return composition;
+        }
+
         /**
          *  Bring degradeable substitution to standard ARIA widgets.  
          * @param element
@@ -55 +88 @@
                         states[ i ] && element.removeAttribute( 'aria-' + states[ i ] );
                 }
 
-                // Translate 'dialog' role by wrapping all containing form fields with a legend that composed of all ARIA
-                // attributes of the dialog which leads to be announced by ATs.
-                if ( role == 'dialog' )
-                {
-                        var fieldset = CKEDITOR.dom.element.createFromHtml(
-                                        '<fieldset style="position: relative;height: 100%;">' +
-                                                '<legend class="cke_voice_label">' +
-                                                        CKEDITOR.tools.htmlEncode( allInOne ) +
-                                                '</legend>' +
-                                        '</fieldset>', doc );
-
-                        var parent;
-                        while( ( parent = element.getParent() ) && !parent.getDtd()[ fieldset.getName() ] )
-                                element = parent;
-                        fieldset.insertBefore( element );
-                        fieldset.append( element );
-                }
                 // The only reliable substitution of aria-label on an iframe
                 // is to use the content window title of that frame.
-                else if ( element.is( 'iframe' ) )
+                if ( element.is( 'iframe' ) )
                 {
                         doc = element.$.contentWindow.document;
                         var title = doc.title;
@@ -115 +131 @@
                                         });
                         }
 
-                        // IE doesn't support 'aria-label', use 'aria-labelledby' instead.
                         if ( CKEDITOR.env.ie )
                         {
+                                // Mannually announce the dialog after showing.
+                                editor.on( 'dialogShow', function( evt )
+                                {
+                                        var dialog = evt.data;
+                                        setTimeout( function()
+                                                {
+                                                        speak(
+                                                                extracAriaInfo( dialog.parts.dialog ),
+                                                                'assertive' );
+                                                }, 500 );
+                                } );
+
+                                // IE doesn't support 'aria-label', use 'aria-labelledby' instead.
                                 CKEDITOR.on( 'ariaWidget', function( evt )
                                         {
                                                 var target = evt.data,