From 8d031215c6cf62f6fc6d9c9257d1e3c2d4f8b24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rn=20Zaefferer?= Date: Mon, 21 Sep 2015 12:49:41 +0200 Subject: [PATCH] Menu: Remove redundant handling of disabled option on create Ref #9151 Ref gh-1599 --- ui/widgets/menu.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ui/widgets/menu.js b/ui/widgets/menu.js index f7fa2b651..d42d65bac 100644 --- a/ui/widgets/menu.js +++ b/ui/widgets/menu.js @@ -71,11 +71,6 @@ return $.widget( "ui.menu", { tabIndex: 0 } ); - if ( this.options.disabled ) { - this._addClass( null, "ui-state-disabled" ); - this.element.attr( "aria-disabled", "true" ); - } - this._addClass( "ui-menu", "ui-widget ui-widget-content" ); this._on( { @@ -359,13 +354,16 @@ return $.widget( "ui.menu", { this._removeClass( icons, null, this.options.icons.submenu ) ._addClass( icons, null, value.submenu ); } - if ( key === "disabled" ) { - this.element.attr( "aria-disabled", value ); - this._toggleClass( null, "ui-state-disabled", !!value ); - } this._super( key, value ); }, + _setOptionDisabled: function( value ) { + this._super( value ); + + this.element.attr( "aria-disabled", String( value ) ); + this._toggleClass( null, "ui-state-disabled", !!value ); + }, + focus: function( event, item ) { var nested, focused, activeParent; this.blur( event, event && event.type === "focus" );