diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-20 20:37:43 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-20 20:37:43 +0100 |
| commit | 8a646989606bd4f1e55a7a988e0c2e9d8031b504 (patch) | |
| tree | 77cfb5a3ed9f2395d1117225372a947a171ac317 /ui | |
| parent | 7cca20daa80a1d68a59ec9bb27fa08361bd03ff7 (diff) | |
| parent | aa05861b857f8b47c2260bfabdfa751a2d13a071 (diff) | |
| download | jquery-ui-8a646989606bd4f1e55a7a988e0c2e9d8031b504.tar.gz jquery-ui-8a646989606bd4f1e55a7a988e0c2e9d8031b504.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.autocomplete.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index f9fa50380..021b330a6 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -66,6 +66,8 @@ $.widget( "ui.autocomplete", { self.element.val( self.term ); self.close( event ); break; + case keyCode.LEFT: + case keyCode.RIGHT: case keyCode.SHIFT: case keyCode.CONTROL: case 18: @@ -333,6 +335,9 @@ $.widget("ui.menu", { "aria-activedescendant": "ui-active-menuitem" }) .click(function(e) { + if ( !$( e.target ).closest( ".ui-menu-item" ).length ) { + return; + } // temporary e.preventDefault(); self.select(); @@ -391,11 +396,11 @@ $.widget("ui.menu", { }, next: function(event) { - this.move("next", "li:first", event); + this.move("next", ".ui-menu-item:first", event); }, previous: function(event) { - this.move("prev", "li:last", event); + this.move("prev", ".ui-menu-item:last", event); }, first: function() { @@ -411,7 +416,7 @@ $.widget("ui.menu", { this.activate(event, this.element.children(edge)); return; } - var next = this.active[direction](); + var next = this.active[direction + "All"](".ui-menu-item").eq(0); if (next.length) { this.activate(event, next); } else { |