Changeset 6972 for CKEditor/trunk

Timestamp:

05/25/11 17:58:19 (2 years ago)

Author:

fredck

Message:

#5314 : The aria-selected attribute was not been removed when rich combo box list items were deselected.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/listblock/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -79 +79 @@
                 <li><a href="http://dev.ckeditor.com/ticket/7637">#7637</a> : Cursor position problematic after inserting page break in some cases.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/188">#188</a> : [IE] Objects selection were making the toolbar inactive on some situations.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/5314">#5314</a> : The aria-selected attribute was not been removed when rich combo box list items were deselected.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>

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

@@ -203 +203 @@
                                         unmark : function( value )
                                         {
-                                                this.element.getDocument().getById( this._.items[ value ] ).removeClass( 'cke_selected' );
-                                                this.onUnmark && this.onUnmark( this._.items[ value ] );
+                                                var doc = this.element.getDocument(),
+                                                        itemId = this._.items[ value ],
+                                                        item = doc.getById( itemId );
+
+                                                item.removeClass( 'cke_selected' );
+                                                doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
+
+                                                this.onUnmark && this.onUnmark( item );
                                         },
 
@@ -214 +220 @@
                                                 for ( var value in items )
                                                 {
-                                                        doc.getById( items[ value ] ).removeClass( 'cke_selected' );
+                                                        var itemId = items[ value ];
+
+                                                        doc.getById( itemId ).removeClass( 'cke_selected' );
+                                                        doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
                                                 }