aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkborchers <kris.borchers@gmail.com>2012-03-18 21:47:40 -0500
committerkborchers <kris.borchers@gmail.com>2012-03-18 21:47:40 -0500
commit4a9e26c68e3443253174f927f4f741d706402032 (patch)
treeef3fe541ae89a57ad8c711eeab7b949ade6053d1
parente38feeacb6f14579a146e6ddc5429a157271cdc9 (diff)
downloadjquery-ui-4a9e26c68e3443253174f927f4f741d706402032.tar.gz
jquery-ui-4a9e26c68e3443253174f927f4f741d706402032.zip
Selectmenu: Add links to all menu items to be in line with what menu expects and remove the extra space added to disabled items
-rw-r--r--themes/base/jquery.ui.selectmenu.css1
-rw-r--r--ui/jquery.ui.selectmenu.js13
2 files changed, 6 insertions, 8 deletions
diff --git a/themes/base/jquery.ui.selectmenu.css b/themes/base/jquery.ui.selectmenu.css
index a8a65efe7..e1b98f046 100644
--- a/themes/base/jquery.ui.selectmenu.css
+++ b/themes/base/jquery.ui.selectmenu.css
@@ -11,7 +11,6 @@
.ui-selectmenu-menu { padding: 0; margin: 0; position:absolute; top: 0; display: none; }
.ui-selectmenu-menu ul.ui-menu { overflow: auto; overflow-y: auto ; overflow-x: hidden; }
.ui-selectmenu-menu .ui-menu .ui-menu-item a { padding: 0.3em 1em 0.3em 1em; }
-.ui-selectmenu-menu .ui-menu li.ui-state-disabled { padding: 0.3em 1em 0.3em 1em; }
.ui-selectmenu-menu .ui-menu li.ui-selectmenu-optgroup { font-weight: bold; line-height: 1.5; padding: 2px 0.4em; margin: 0.5em 0 0 0; }
.ui-selectmenu-open { display: block; }
.ui-selectmenu-button a.ui-button { display: inline-block; overflow: hidden; position: relative; text-decoration: none; }
diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js
index dbf15d33b..98c8c77c2 100644
--- a/ui/jquery.ui.selectmenu.js
+++ b/ui/jquery.ui.selectmenu.js
@@ -258,14 +258,13 @@ $.widget( "ui.selectmenu", {
_renderItem: function( ul, item) {
var li = $( "<li />" ).data( "item.selectmenu", item );
if ( item.disabled ) {
- li.addClass( 'ui-state-disabled' ).html( item.label );
- } else {
- li.append( $( "<a />", {
- html: item.label,
- href: '#'
- })
- );
+ li.addClass( 'ui-state-disabled' );
}
+ li.append( $( "<a />", {
+ html: item.label,
+ href: '#'
+ })
+ );
return li.appendTo( ul );
},