Skip to content

Commit 93a07a4

Browse files
committed
Merge branch 't/11260'
2 parents 59c2758 + 9b8d92c commit 93a07a4

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Fixed Issues:
3434
* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: editor.destroy() does not cleanup content generated by [TableResize plugin](http://ckeditor.com/addon/tableresize) for inline editors.
3535
* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute's value is deleted when pasting content from MS Word.
3636
* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside `<textarea>` element are not encoded.
37+
* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled is not read by JAWS as disabled.
3738

3839
## CKEditor 4.3
3940

plugins/button/plugin.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
(function() {
77
var template = '<a id="{id}"' +
88
' class="cke_button cke_button__{name} cke_button_{state} {cls}"' +
9-
( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 && !CKEDITOR.env.hc ? '' : '" href="javascript:void(\'{titleJs}\')"' ) +
9+
( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 && !CKEDITOR.env.hc ? '' : ' href="javascript:void(\'{titleJs}\')"' ) +
1010
' title="{title}"' +
1111
' tabindex="-1"' +
1212
' hidefocus="true"' +
1313
' role="button"' +
1414
' aria-labelledby="{id}_label"' +
15-
' aria-haspopup="{hasArrow}"';
15+
' aria-haspopup="{hasArrow}"' +
16+
' aria-disabled="{ariaDisabled}"';
1617

1718
// Some browsers don't cancel key events in the keydown but in the
1819
// keypress.
@@ -268,6 +269,7 @@
268269
label: this.label,
269270
cls: this.className || '',
270271
state: stateName,
272+
ariaDisabled: stateName == 'disabled' ? 'true' : 'false',
271273
title: this.title,
272274
titleJs: env.gecko && env.version >= 10900 && !env.hc ? '' : ( this.title || '' ).replace( "'", '' ),
273275
hasArrow: this.hasArrow ? 'true' : 'false',

0 commit comments

Comments
 (0)