Changeset 4935

Timestamp:

01/16/10 07:21:41 (3 years ago)

Author:

garry.yao

Message:

Fixing accessibilty plugin breaks when certain ARIA attributes haven't present on the widget.

Location:

CKEditor/branches/features/aria/_source

Files:

• core/config.js (modified) (1 diff)
• plugins/accessibility/plugin.js (modified) (2 diffs)

CKEditor/branches/features/aria/_source/core/config.js

@@ -213 +213 @@
          * @example
          */
-        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,accessibility,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**

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

@@ -44 +44 @@
                         return element;
 
-                var labelText = element.getAttribute( 'aria-label' ) || doc.getById( element.getAttribute( 'aria-labelledby' ) ).getText() || '',
-                                descriptionText = doc.getById( element.getAttribute( 'aria-describedby' ) ).getText() || '',
-                                legend = [ labelText, role, descriptionText ].join( ' ' );
+                var attrValue,
+                         labelText = element.getAttribute( 'aria-label' ) || ( attrValue = element.getAttribute( 'aria-labelledby' ) ) && doc.getById( attrValue ).getText() || '',
+                         descriptionText = ( attrValue = element.getAttribute( 'aria-describedby' ) ) && doc.getById( attrValue ).getText() || '',
+                         legend = [ labelText, role, descriptionText ].join( ' ' );
 
                 // Remove all ARIA attributes on the widget that could
@@ -91 +92 @@
         });
 
-} )( );
+} )();