Changeset 4898

Timestamp:

01/07/10 12:43:29 (3 years ago)

Author:

garry.yao

Message:

Enhancing toolbar buttons in the following sense:

1. Pressed button state indication.
2. Menu type button (combo button) indication.

Location:

CKEditor/branches/features/aria/_source/plugins

Files:

• button/plugin.js (modified) (2 diffs)
• richcombo/plugin.js (modified) (1 diff)

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

@@ -140 +140 @@
                                 ' hidefocus="true"' +
                             ' role="button"' +
-                                ' aria-labelledby="' + id + '_label"' );
+                                ' aria-labelledby="' + id + '_label"' +
+                                ( this.hasArrow ?  ' aria-haspopup="true"' : '' ) );
 
                 // Some browsers don't cancel key events in the keydown but in the
@@ -204 +205 @@
                                 element.setAttribute( 'aria-disabled', true ) :
                                 element.removeAttribute( 'aria-disabled' );
+
+                        state == CKEDITOR.TRISTATE_ON ?
+                                element.setAttribute( 'aria-pressed', true ) :
+                                element.removeAttribute( 'aria-pressed' );
                 }
 

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

@@ -166 +166 @@
                                         '<span id="' + id+ '_label" class=cke_label>', this.label, '</span>' +
                                         '<a hidefocus=true title="', this.title, '" tabindex="-1" href="javascript:void(\'', this.label, '\')"' +
-                                                ' role="button" aria-labelledby="', id , '_label" aria-describedby="', id, '_text"' );
+                                                ' role="button" aria-labelledby="', id , '_label" aria-describedby="', id, '_text" aria-haspopup="true"' );
 
                         // Some browsers don't cancel key events in the keydown but in the