aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorkborchers <kris.borchers@gmail.com>2011-12-01 12:48:29 -0600
committerkborchers <kris.borchers@gmail.com>2011-12-01 12:49:01 -0600
commitc3369365c37363a91acb6d13fa3f112372439b5a (patch)
tree50b67d549fa3b55da37121815056792f85816f1f /ui
parentb539e2e5c8528fb1cfaa241fd509fc1ccf65a095 (diff)
parentce7918fc73c161ab237f052bad070e34250526be (diff)
downloadjquery-ui-c3369365c37363a91acb6d13fa3f112372439b5a.tar.gz
jquery-ui-c3369365c37363a91acb6d13fa3f112372439b5a.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.menu.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 77190189e..0263cff65 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -20,7 +20,7 @@ $.widget( "ui.menu", {
defaultElement: "<ul>",
delay: 150,
options: {
- items: "ul",
+ menus: "ul",
position: {
my: "left top",
at: "right top"
@@ -250,7 +250,7 @@ $.widget( "ui.menu", {
refresh: function() {
// initialize nested menus
- var submenus = this.element.find( this.options.items + ":not( .ui-menu )" )
+ var submenus = this.element.find( this.options.menus + ":not( .ui-menu )" )
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
.attr( "role", "menu" )
.hide()