aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.menu.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-05-10 12:35:19 -0400
committerScott González <scott.gonzalez@gmail.com>2011-05-10 12:35:19 -0400
commit319c5eb2c123c24983e38cc9d9fe3058ab045cf4 (patch)
tree2ab6e914ebdb7b2fe25e58369a4a02a7239e225d /ui/jquery.ui.menu.js
parent7e239e2ab2c1147c4a14f6de36e7ecbbdf3d97e9 (diff)
parent7f8ccc523a7879428913e64f4b7eb4ace4d17a08 (diff)
downloadjquery-ui-319c5eb2c123c24983e38cc9d9fe3058ab045cf4.tar.gz
jquery-ui-319c5eb2c123c24983e38cc9d9fe3058ab045cf4.zip
Merge branch 'master' of github.com:jquery/jquery-ui
Diffstat (limited to 'ui/jquery.ui.menu.js')
-rw-r--r--ui/jquery.ui.menu.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 0841018af..3cc25062c 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -18,6 +18,7 @@ var idIncrement = 0;
$.widget("ui.menu", {
defaultElement: "<ul>",
delay: 150,
+ isNewMenu: true,
options: {
position: {
my: "left top",
@@ -54,7 +55,8 @@ $.widget("ui.menu", {
self.select( event );
})
.bind( "mouseover.menu", function( event ) {
- if ( self.options.disabled ) {
+ if ( self.options.disabled || self.isNewMenu ) {
+ self.isNewMenu = false;
return;
}
var target = $( event.target ).closest( ".ui-menu-item" );