diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-26 12:45:32 -0400 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-26 12:45:32 -0400 |
| commit | f1933142e485ceaaef9ef52e56abb9f43eaaad2d (patch) | |
| tree | 3b70640ecf55aa40bee9c3c9946268792e39ba30 /ui | |
| parent | e8f397bc145ffd9de4441a269e0d45c5fe1fa9cf (diff) | |
| parent | 6d9caf1e230b7b9a4291a8e3525eefad2f08b6f8 (diff) | |
| download | jquery-ui-f1933142e485ceaaef9ef52e56abb9f43eaaad2d.tar.gz jquery-ui-f1933142e485ceaaef9ef52e56abb9f43eaaad2d.zip | |
Merge branch 'master' into tooltip
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.autocomplete.js | 6 | ||||
| -rw-r--r-- | ui/jquery.ui.core.js | 1 | ||||
| -rw-r--r-- | ui/jquery.ui.dialog.js | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index fab7a6287..a1d798c59 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -70,7 +70,7 @@ $.widget( "ui.autocomplete", { case keyCode.RIGHT: case keyCode.SHIFT: case keyCode.CONTROL: - case 18: + case keyCode.ALT: // ignore metakeys (shift, ctrl, alt) break; default: @@ -140,7 +140,7 @@ $.widget( "ui.autocomplete", { destroy: function() { this.element - .removeClass( "ui-autocomplete-input ui-widget ui-widget-content" ) + .removeClass( "ui-autocomplete-input" ) .removeAttr( "autocomplete" ) .removeAttr( "role" ) .removeAttr( "aria-autocomplete" ) @@ -335,7 +335,7 @@ $.widget("ui.menu", { "aria-activedescendant": "ui-active-menuitem" }) .click(function( event ) { - if ( !$( event.target ).closest( ".ui-menu-item" ).length ) { + if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) { return; } // temporary diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index e0e1727ee..197a1aba9 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -70,6 +70,7 @@ $.ui = { }, keyCode: { + ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 0291c3da0..6e538b6e5 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -622,8 +622,11 @@ $.widget("ui.dialog", { // reset content sizing // hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350) - this.element.css('width', 'auto') - .hide(); + this.element.css({ + width: 'auto', + minHeight: 0, + height: 0 + }); // reset wrapper sizing // determine the height of all the non-content elements |