Skip to content
Permalink
Browse files

Merge branch 't/11260'

  • Loading branch information...
Reinmar committed Dec 6, 2013
2 parents 59c2758 + 9b8d92c commit 93a07a44712635b89fa7bfed87e41cbd47d2ae6f
Showing with 5 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +4 −2 plugins/button/plugin.js
@@ -34,6 +34,7 @@ Fixed Issues:
* [#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.
* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute's value is deleted when pasting content from MS Word.
* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside `<textarea>` element are not encoded.
* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled is not read by JAWS as disabled.

## CKEditor 4.3

@@ -6,13 +6,14 @@
(function() {
var template = '<a id="{id}"' +
' class="cke_button cke_button__{name} cke_button_{state} {cls}"' +
( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 && !CKEDITOR.env.hc ? '' : '" href="javascript:void(\'{titleJs}\')"' ) +
( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 && !CKEDITOR.env.hc ? '' : ' href="javascript:void(\'{titleJs}\')"' ) +
' title="{title}"' +
' tabindex="-1"' +
' hidefocus="true"' +
' role="button"' +
' aria-labelledby="{id}_label"' +
' aria-haspopup="{hasArrow}"';
' aria-haspopup="{hasArrow}"' +
' aria-disabled="{ariaDisabled}"';

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

0 comments on commit 93a07a4

Please sign in to comment.
You can’t perform that action at this time.