Ticket #5125: 5125.patch

_source/plugins/wysiwygarea/plugin.js

@@ -241 +241 @@
                         var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
                                 ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
 
+                        var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
+
                         editor.on( 'editingBlockReady', function()
                                 {
                                         var mainElement,
@@ -250 +252 @@
                                                 frameLoaded,
                                                 fireMode;
 
-                                        var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
 
                                         // Support for custom document.domain in IE.
                                         var isCustomDomain = CKEDITOR.env.isCustomDomain();
@@ -275 +276 @@
                                                                 '})())"' : '' ) +
                                                         ' tabIndex="-1"' +
                                                         ' allowTransparency="true"' +
-                                                        ' role="region"' +
+                                                        ' role="editbox"' +
                                                         ' aria-multiline="true"' +
                                                         ' aria-label="' + frameLabel + '"' +
                                                         '></iframe>' );
@@ -722 +723 @@
                                         editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
                                 });
 
+                        var titleBackup;
+                        // Setting voice label as window title, backup the original one
+                        // and restore it before running into use.
+                        editor.on( 'contentDom', function ()
+                                {
+                                        titleBackup = editor.document.$.title;
+                                        editor.document.$.title = frameLabel;
+                                });
+
+                        editor.on( 'beforeModeUnload', function()
+                                {
+                                        editor.mode == 'wysiwyg' && ( editor.document.$.title = titleBackup );
+                                });
+
                         // Create an invisible element to grab focus.
                         if( CKEDITOR.env.ie )
                         {

_source/plugins/a11ycompat/plugin.js

@@ -22 +22 @@
         function lookupARIASupport( role, tagName )
         {
                 return {
-                                'dialog' :       env.gecko && env.version >= 10900,
-                                'region' : env.gecko && env.version >= 10900
+                                'dialog' :       env.gecko && env.version >= 10900
                         }[ role ];
         }
 
@@ -72 +71 @@
                         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' ) )
-                {
-                        doc = element.$.contentWindow.document;
-                        var title = doc.title;
-
-                        // Backup the title and restore it before running into use.
-                        title && editor.on( 'beforeModeUnload', function() { doc.title = title; } );
-                        doc.title = allInOne;
-                }
-        }
+        }
 
         CKEDITOR.plugins.add( 'a11ycompat',
         {