aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.menu.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-11-13 19:45:56 +0100
committerFelix Nagel <info@felixnagel.com>2013-11-13 19:45:56 +0100
commitab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f (patch)
treededf39afe3330bae4eec603297432d972e5bcfc1 /ui/jquery.ui.menu.js
parenta6c5f58d8243b39c6cd57b76ffb0776adfcc8b1c (diff)
parent14782c04e2201c53e3ecb80b086f1a4c27aa991d (diff)
downloadjquery-ui-ab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f.tar.gz
jquery-ui-ab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.menu.js')
-rw-r--r--ui/jquery.ui.menu.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index b0ff38894..c5d2bc777 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -26,7 +26,7 @@ $.widget( "ui.menu", {
items: "> *",
menus: "ul",
position: {
- my: "left top",
+ my: "left-1 top",
at: "right top"
},
role: "menu",
@@ -44,7 +44,7 @@ $.widget( "ui.menu", {
this.mouseHandled = false;
this.element
.uniqueId()
- .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+ .addClass( "ui-menu ui-widget ui-widget-content" )
.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
.attr({
role: this.options.role,
@@ -147,7 +147,7 @@ $.widget( "ui.menu", {
this.element
.removeAttr( "aria-activedescendant" )
.find( ".ui-menu" ).addBack()
- .removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
+ .removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons" )
.removeAttr( "role" )
.removeAttr( "tabIndex" )
.removeAttr( "aria-labelledby" )
@@ -163,7 +163,7 @@ $.widget( "ui.menu", {
.removeAttr( "role" )
.removeAttr( "aria-disabled" )
.removeUniqueId()
- .removeClass( "ui-corner-all ui-state-hover" )
+ .removeClass( "ui-state-hover" )
.removeAttr( "tabIndex" )
.removeAttr( "role" )
.removeAttr( "aria-haspopup" )
@@ -292,7 +292,7 @@ $.widget( "ui.menu", {
// Initialize nested menus
submenus.filter( ":not(.ui-menu)" )
- .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+ .addClass( "ui-menu ui-widget ui-widget-content" )
.hide()
.attr({
role: this.options.role,
@@ -328,7 +328,6 @@ $.widget( "ui.menu", {
items.not( ".ui-menu-item, .ui-menu-divider" )
.addClass( "ui-menu-item" )
.uniqueId()
- .addClass( "ui-corner-all" )
.attr({
tabIndex: -1,
role: this._itemRole()