Index: /CKEditor/branches/features/aria/_source/lang/en.js
===================================================================
--- /CKEditor/branches/features/aria/_source/lang/en.js (revision 4895)
+++ /CKEditor/branches/features/aria/_source/lang/en.js (revision 4896)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -93,8 +93,5 @@
validateNumberFailed : 'This value is not a number.',
confirmNewPage : 'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',
- confirmCancel : 'Some of the options have been changed. Are you sure to close the dialog?',
-
- // Put the voice-only part of the label in the span.
- unavailable : '%1, unavailable'
+ confirmCancel : 'Some of the options have been changed. Are you sure to close the dialog?'
},
@@ -533,5 +530,4 @@
{
label : 'Styles',
- voiceLabel : 'Styles',
panelVoiceLabel : 'Select a style',
panelTitle1 : 'Block Styles',
@@ -543,5 +539,4 @@
{
label : 'Format',
- voiceLabel : 'Format',
panelTitle : 'Paragraph Format',
panelVoiceLabel : 'Select a paragraph format',
Index: /CKEditor/branches/features/aria/_source/plugins/button/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/button/plugin.js (revision 4895)
+++ /CKEditor/branches/features/aria/_source/plugins/button/plugin.js (revision 4896)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -138,5 +138,7 @@
' title="', this.title, '"' +
' tabindex="-1"' +
- ' hidefocus="true"' );
+ ' hidefocus="true"' +
+ ' role="button"' +
+ ' aria-labelledby="' + id + '_label"' );
// Some browsers don't cancel key events in the keydown but in the
@@ -171,5 +173,5 @@
output.push(
'>' +
- '', this.label, '' );
+ '', this.label, '' );
if ( this.hasArrow )
@@ -199,13 +201,7 @@
{
element.setState( state );
-
- var htmlTitle = this.title,
- unavailable = this._.editor.lang.common.unavailable,
- labelElement = element.getChild( 1 );
-
- if ( state == CKEDITOR.TRISTATE_DISABLED )
- htmlTitle = unavailable.replace( '%1', this.title );
-
- labelElement.setHtml( htmlTitle );
+ state == CKEDITOR.TRISTATE_DISABLED ?
+ element.setAttribute( 'aria-disabled', true ) :
+ element.removeAttribute( 'aria-disabled' );
}
Index: /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js (revision 4895)
+++ /CKEditor/branches/features/aria/_source/plugins/panel/plugin.js (revision 4896)
@@ -156,6 +156,6 @@
'' +
'' +
- '' +
+ ' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');"' +
+ ' role="application">' +
// It looks strange, but for FF2, the styles must go
// after