Changeset 5107

Timestamp:

02/12/10 14:54:29 (3 years ago)

Author:

garry.yao

Message:

Fixing #5125: Make the wysiwyg mode editable by default in FF+JAWS.

Location:

CKEditor/branches/versions/3.2.x/_source/plugins

Files:

• a11ycompat/plugin.js (modified) (2 diffs)
• htmldataprocessor/plugin.js (modified) (1 diff)
• wysiwygarea/plugin.js (modified) (4 diffs)

CKEditor/branches/versions/3.2.x/_source/plugins/a11ycompat/plugin.js

@@ -23 +23 @@
         {
                 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/branches/versions/3.2.x/_source/plugins/htmldataprocessor/plugin.js

@@ -186 +186 @@
                                         if ( !element.attributes.type )
                                                 element.attributes.type = 'text/css';
+                                },
+
+                                title : function( element )
+                                {
+                                        element.children[ 0 ].value = element.attributes[ '_cke_title' ];
                                 }
                         },

CKEditor/branches/versions/3.2.x/_source/plugins/wysiwygarea/plugin.js

@@ -242 +242 @@
                                 ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
 
+                        var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
+
                         editor.on( 'editingBlockReady', function()
                                 {
@@ -251 +253 @@
                                                 fireMode;
 
-                                        var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
 
                                         // Support for custom document.domain in IE.
@@ -276 +277 @@
                                                         ' tabIndex="-1"' +
                                                         ' allowTransparency="true"' +
-                                                        ' role="region"' +
+                                                        ' role="editbox"' +
                                                         ' aria-multiline="true"' +
                                                         ' aria-label="' + frameLabel + '"' +
@@ -723 +724 @@
                                 });
 
+                        var titleBackup;
+                        // Setting voice label as window title, backup the original one
+                        // and restore it before running into use.
+                        editor.on( 'contentDom', function ()
+                                {
+                                        var title = editor.document.getElementsByTag( 'title' ).getItem( 0 );
+                                        title.setAttribute( '_cke_title', editor.document.$.title );
+                                        editor.document.$.title = frameLabel;
+                                });
+
+
                         // Create an invisible element to grab focus.
                         if( CKEDITOR.env.ie )