diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-10 16:59:22 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-10 16:59:22 +0200 |
| commit | c844bbd2edd4c5d822bc72394bce64af0952c76e (patch) | |
| tree | 6f4e1ab7aa73ef46017f0043f25936c6dc3e950c /ui | |
| parent | 1a974109ef72fcef04a2632594189387102e9778 (diff) | |
| parent | 73ed73890c0e91430a6dc2a01a971f9a4586a6e0 (diff) | |
| download | jquery-ui-c844bbd2edd4c5d822bc72394bce64af0952c76e.tar.gz jquery-ui-c844bbd2edd4c5d822bc72394bce64af0952c76e.zip | |
Merge remote branch 'kborchers/bug_7024'
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.autocomplete.js | 1 | ||||
| -rw-r--r-- | ui/jquery.ui.menu.js | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index 526eb3869..e388a63bd 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -338,6 +338,7 @@ $.widget( "ui.autocomplete", { this.menu.element.hide(); this.menu.blur(); this._trigger( "close", event ); + this.menu.isNewMenu = true; } }, 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" ); |