diff options
| author | Felix Nagel <info@felixnagel.com> | 2010-12-20 22:27:59 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2010-12-20 22:27:59 +0100 |
| commit | 47b7c037a5662672d1509799c63856bea83047b6 (patch) | |
| tree | 7808c7b464f296c408d39a43d07b3ab4f946c908 | |
| parent | a7c1d8c357ebc91aaca60914eda4afdc28be1b64 (diff) | |
| download | jquery-ui-47b7c037a5662672d1509799c63856bea83047b6.tar.gz jquery-ui-47b7c037a5662672d1509799c63856bea83047b6.zip | |
fixed: small follow-up for refresh functionality
fixed: cleaned background image demo
fixed: small follow-up to height of the widget to match jQuery UI button height
| -rw-r--r-- | demos/selectmenu/background_image.html | 4 | ||||
| -rw-r--r-- | themes/base/jquery.ui.selectmenu.css | 4 | ||||
| -rw-r--r-- | ui/jquery.ui.selectmenu.js | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/demos/selectmenu/background_image.html b/demos/selectmenu/background_image.html index c34afc0cf..d33e0884f 100644 --- a/demos/selectmenu/background_image.html +++ b/demos/selectmenu/background_image.html @@ -40,6 +40,7 @@ <script type="text/javascript"> $(function(){ $('select#files').selectmenu({ + style:'popup', icons: [ {find: '.script', icon: 'ui-icon-script'}, {find: '.image', icon: 'ui-icon-image'} @@ -47,6 +48,7 @@ }); $('select#filesB').selectmenu({ + style:'popup', icons: [ {find: '.video'}, {find: '.podcast'}, @@ -55,7 +57,6 @@ }); $('select#peopleA').selectmenu({ - style:'dropdown', icons: [ {find: '.avatar'} ], @@ -65,7 +66,6 @@ }); $('select#peopleB').selectmenu({ - style:'dropdown', icons: [ {find: '.css-avatar'} ], diff --git a/themes/base/jquery.ui.selectmenu.css b/themes/base/jquery.ui.selectmenu.css index 6e1deaf08..350aa9dbe 100644 --- a/themes/base/jquery.ui.selectmenu.css +++ b/themes/base/jquery.ui.selectmenu.css @@ -7,7 +7,7 @@ .ui-selectmenu-menu-popup { margin-top: -1px; } .ui-selectmenu-menu-dropdown { } .ui-selectmenu-menu li { padding:0; margin:0; display: block; border-top: 1px dotted transparent; border-bottom: 1px dotted transparent; border-right-width: 0 !important; border-left-width: 0 !important; font-weight: normal !important; } -.ui-selectmenu-menu li a,.ui-selectmenu-status { line-height: 1.4em; display: block; padding: .4em 1em; outline:none; text-decoration:none; } +.ui-selectmenu-menu li a,.ui-selectmenu-status { line-height: 1.4em; display: block; padding: .405em 1em; outline:none; text-decoration:none; } .ui-selectmenu-menu li.ui-selectmenu-hasIcon a, .ui-selectmenu-hasIcon .ui-selectmenu-status { padding-left: 20px; position: relative; margin-left: 5px; } .ui-selectmenu-menu li .ui-icon, .ui-selectmenu-status .ui-icon { position: absolute; top: 1em; margin-top: -8px; left: 0; } @@ -20,5 +20,5 @@ .ui-selectmenu-menu li .ui-selectmenu-item-footer { opacity: .8; } /*for optgroups*/ .ui-selectmenu-menu .ui-selectmenu-group { font-size: 1em; } -.ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding:.6em .5em 0; font-weight: bold; } +.ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding: .6em .5em 0; font-weight: bold; } .ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; }
\ No newline at end of file diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js index e5eab3da9..5e6d78fef 100644 --- a/ui/jquery.ui.selectmenu.js +++ b/ui/jquery.ui.selectmenu.js @@ -317,7 +317,7 @@ $.widget("ui.selectmenu", { // add corners to top and bottom menu items .find('li:first') .toggleClass("ui-corner-top", !isDropDown) - .find('li:last') + .end().find('li:last') .addClass("ui-corner-bottom"); this.selectmenuIcon .toggleClass('ui-icon-triangle-1-s', isDropDown) @@ -431,7 +431,7 @@ $.widget("ui.selectmenu", { this.list.addClass(self.widgetBaseClass + '-open') .attr('aria-hidden', false) .find('li:not(.'+ self.widgetBaseClass +'-group):eq('+ this._selectedIndex() +') a')[0].focus(); - if(this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-all').addClass('ui-corner-top'); } + if (this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-all').addClass('ui-corner-top'); } this._refreshPosition(); this._trigger("open", event, this._uiHash()); } @@ -443,8 +443,8 @@ $.widget("ui.selectmenu", { this.list .attr('aria-hidden', true) .removeClass(this.widgetBaseClass+'-open'); - if(this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all'); } - if(retainFocus){this.newelement.focus();} + if (this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all'); } + if (retainFocus){this.newelement.focus();} this._trigger("close", event, this._uiHash()); } }, |