Changeset 7451 for CKEditor/trunk

Timestamp:

04/05/12 15:02:08 (15 months ago)

Author:

garry.yao

Message:

#8864: Put the ARIA role on iframe body element in IE.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/floatpanel/plugin.js (modified) (1 diff)
• _source/plugins/panel/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -93 +93 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8493">#8493</a> : [IE] It is impossible to add a link to the selected text.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/8528">#8528</a> : Redundant <code>imagePreviewBoxId</code> in the Image Properties dialog window is now removed.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8864">#8864</a> : [IE]Fix ARIA presentation of toolbar rich combo in JAWS.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/floatpanel/plugin.js

@@ -47 +47 @@
                                 element = panel.element,
                                 iframe = element.getFirst().getFirst();
+
+                        // Disable native browser menu. (#4825)
+                        element.disableContextMenu();
 
                         this.element = element;

CKEditor/trunk/_source/plugins/panel/plugin.js

@@ -228 +228 @@
                 var blocks = this._.blocks,
                         block = blocks[ name ],
-                        current = this._.currentBlock,
-                        holder = this.forceIFrame ?
-                                this.document.getById( this.id + '_frame' )
-                                : this._.holder;
-
-                // Disable context menu for block panel.
-                holder.getParent().getParent().disableContextMenu();
+                        current = this._.currentBlock;
+
+                // ARIA role works better in IE on the body element, while on the iframe
+                // for FF. (#8864)
+                var holder = !this.forceIFrame || CKEDITOR.env.ie ?
+                                 this._.holder : this.document.getById( this.id + '_frame' );
 
                 if ( current )