Changeset 4900

Timestamp:

01/07/10 19:17:52 (3 years ago)

Author:

garry.yao

Message:

ARIA-enabling list panel which affect directly on all combo lists.

Location:

CKEditor/branches/features/aria/_source/plugins

Files:

• floatpanel/plugin.js (modified) (1 diff)
• listblock/plugin.js (modified) (6 diffs)
• panel/plugin.js (modified) (1 diff)

CKEditor/branches/features/aria/_source/plugins/floatpanel/plugin.js

@@ -257 +257 @@
                                                                 }
 
-                                                                iframe.$.contentWindow.focus();
+                                                                block.element.focus();
                                                                 // We need this get fired manually because of unfired focus() function.
                                                                 this.allowBlur( true );

CKEditor/branches/features/aria/_source/plugins/listblock/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -24 +24 @@
                                         this.base( blockHolder );
 
+                                        this.element.setAttribute( 'role', 'listbox' );
+
                                         this.multiSelect = !!multiSelect;
 
@@ -82 +84 @@
                                                         pendingHtml.push( '<ul class=cke_panel_list>' );
                                                         this._.started = 1;
+                                                        this._.size = this._.size || 0;
                                                 }
 
@@ -88 +91 @@
                                                 pendingHtml.push(
                                                         '<li id=', id, ' class=cke_panel_listItem>' +
-                                                                '<a _cke_focus=1 hidefocus=true' +
+                                                                '<a id="', id, '_option" _cke_focus=1 hidefocus=true' +
                                                                         ' title="', title || value, '"' +
                                                                         ' href="javascript:void(\'', value, '\')"' +
-                                                                        ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;">',
+                                                                        ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
+                                                                        ' role="option"' +
+                                                                        ' aria-posinset="' + ++this._.size + '">',
                                                                         html || value,
                                                                 '</a>' +
@@ -112 +117 @@
                                                 this._.close();
                                                 this.element.appendHtml( this._.pendingHtml.join( '' ) );
+
+                                                var items = this._.items,
+                                                        doc = this.element.getDocument();
+                                                for ( var value in items )
+                                                        doc.getById( items[ value ] + '_option' ).setAttribute( 'aria-setsize', this._.size );
+                                                delete this._.size;
+
                                                 this._.pendingHtml = [];
                                         },
@@ -174 +186 @@
                                                         this.unmarkAll();
 
-                                                this.element.getDocument().getById( this._.items[ value ] ).addClass( 'cke_selected' );
+                                                var itemId = this._.items[ value ],
+                                                        item = this.element.getDocument().getById( itemId );
+                                                item.addClass( 'cke_selected' );
+
+                                                this.element.getDocument().getById( itemId + '_option' ).setAttribute( 'aria-selected', true );
+                                                this.element.setAttribute( 'aria-activedescendant', itemId + '_option' );
                                         },
 

CKEditor/branches/features/aria/_source/plugins/panel/plugin.js

@@ -248 +248 @@
                                         attributes :
                                         {
+                                                'tabIndex' : -1,
                                                 'class' : 'cke_panel_block'
                                         },