diff options
| -rw-r--r-- | themes/base/jquery.ui.selectmenu.css | 5 | ||||
| -rw-r--r-- | ui/jquery.ui.selectmenu.js | 33 |
2 files changed, 31 insertions, 7 deletions
diff --git a/themes/base/jquery.ui.selectmenu.css b/themes/base/jquery.ui.selectmenu.css index d64084d60..6149a0bb7 100644 --- a/themes/base/jquery.ui.selectmenu.css +++ b/themes/base/jquery.ui.selectmenu.css @@ -10,7 +10,8 @@ .ui-selectmenu-menu { padding: 0; margin: 0; position:absolute; top: 0; display: none; } .ui-selectmenu-menu .ui-menu { padding: 0; } +.ui-selectmenu-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-button span.ui-icon { right: 0.5em; left: auto; } -.ui-button span.ui-button-text { text-align: left; padding: 0.4em 2.1em 0.4em 1em }
\ No newline at end of file +.ui-selectmenu-button span.ui-icon { right: 0.5em; left: auto; } +.ui-selectmenu-button span.ui-button-text { text-align: left; padding: 0.4em 2.1em 0.4em 1em }
\ No newline at end of file diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js index cf2c175fb..7d6269d2b 100644 --- a/ui/jquery.ui.selectmenu.js +++ b/ui/jquery.ui.selectmenu.js @@ -23,6 +23,7 @@ $.widget( "ui.selectmenu", { version: "@VERSION", defaultElement: "<select>", options: { + dropdown: true, wrapperElement: "<div />", appendTo: "body", position: { @@ -65,18 +66,21 @@ $.widget( "ui.selectmenu", { // create button self.newelement = $( '<a />', { href: '#' + selectmenuId, - tabindex: (tabindex ? tabindex : self.element.attr( 'disabled' ) ? 1 : 0), + tabindex: ( tabindex ? tabindex : self.element.attr( 'disabled' ) ? 1 : 0 ), 'aria-haspopup': true, 'aria-owns': self.ids[ 1 ], css: { width: self.element.width() } - }).button({ + }) + .addClass( self.widgetBaseClass + '-button' ) + .button({ label: self.items.eq( self.element[0].selectedIndex ).text(), icons: { - primary: "ui-icon-triangle-2-n-s" + primary: ( options.dropdown ? 'ui-icon-triangle-1-s' : 'ui-icon-triangle-2-n-s' ) } }); + self.newelementWrap = $( options.wrapperElement ) .append( self.newelement ) .insertAfter( self.element ); @@ -130,8 +134,7 @@ $.widget( "ui.selectmenu", { } return ret; }); - - + // create menu portion, append to body self.list = $( '<ul />', { 'class': 'ui-widget ui-widget-content', @@ -167,6 +170,12 @@ $.widget( "ui.selectmenu", { } }); + if ( options.dropdown ) { + self.list + .addClass( 'ui-corner-bottom' ) + .removeClass( 'ui-corner-all' ); + } + // document click closes menu $( document ).bind( 'mousedown.selectmenu', function( event ) { if ( self.options.open ) { @@ -190,6 +199,14 @@ $.widget( "ui.selectmenu", { var self = this, options = this.options; + + if ( options.dropdown ) { + self.newelement + .addClass( 'ui-corner-top' ) + .removeClass( 'ui-corner-all' ); + } + + self.listWrap.addClass( self.widgetBaseClass + '-open' ); this.options.open = true; @@ -203,6 +220,12 @@ $.widget( "ui.selectmenu", { var self = this, options = this.options; + if ( options.dropdown ) { + self.newelement + .addClass( 'ui-corner-all' ) + .removeClass( 'ui-corner-top' ); + } + self.listWrap.removeClass( self.widgetBaseClass + '-open' ); this.options.open = false; |