From d1ccc172f77575410f59229e22cca182b377f72d Mon Sep 17 00:00:00 2001 From: fredck Date: Fri, 6 Dec 2013 11:37:42 +0100 Subject: [PATCH 1/3] Setting the start value of aria-disabled on buttons. --- plugins/button/plugin.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/button/plugin.js b/plugins/button/plugin.js index 18ff3730b13..dd76951ccc0 100644 --- a/plugins/button/plugin.js +++ b/plugins/button/plugin.js @@ -12,7 +12,8 @@ ' 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', From bbcb3298f55bb0eab4f5e1e7d05c6655ffdc9551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Fri, 6 Dec 2013 12:35:47 +0100 Subject: [PATCH 2/3] Removed excessive quote. --- plugins/button/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/button/plugin.js b/plugins/button/plugin.js index dd76951ccc0..20ed19380a5 100644 --- a/plugins/button/plugin.js +++ b/plugins/button/plugin.js @@ -6,7 +6,7 @@ (function() { var template = '= 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"' + From 9b8d92c4b037727a2b7e76670738ef4cba169001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Fri, 6 Dec 2013 12:44:07 +0100 Subject: [PATCH 3/3] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 440d7bae208..54ccdcba504 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 `