Skip to content
Permalink
Browse files

Merge branch 't/10152'

  • Loading branch information...
oleq committed Mar 4, 2013
2 parents 29042f9 + 51b5bba commit 6bf40ac800d98a1e037751bad82ad5c052f14e62
Showing with 2 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +1 −3 plugins/menu/plugin.js
@@ -21,6 +21,7 @@ CKEditor 4 Changelog
* [#9947](http://dev.ckeditor.com/ticket/9947): [Webkit] Editor overflows parent container in some edge cases.
* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken sourcearea view when RTL language is set.
* [#10123](http://dev.ckeditor.com/ticket/10123): [Webkit] Fixed: Several dialogs have broken layout since latest Webkit.
* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.

## CKEditor 4.0.1.1

@@ -89,8 +89,7 @@ CKEDITOR.plugins.add( 'menu', {
' hidefocus="true"' +
' role="menuitem"' +
' aria-haspopup="{hasPopup}"' +
' aria-disabled="{disabled}"' +
' aria-pressed="{pressed}"';
' aria-disabled="{disabled}"';

// Some browsers don't cancel key events in the keydown but in the
// keypress.
@@ -449,7 +448,6 @@ CKEDITOR.plugins.add( 'menu', {
state: stateName,
hasPopup: hasSubMenu ? 'true' : 'false',
disabled: state == CKEDITOR.TRISTATE_DISABLED,
pressed: state == CKEDITOR.TRISTATE_ON,
title: this.label,
href: 'javascript:void(\'' + ( this.label || '' ).replace( "'" + '' ) + '\')',
hoverFn: menu._.itemOverFn,

0 comments on commit 6bf40ac

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