Skip to content
Permalink
Browse files

Selectmenu: removed option wrapperElement

  • Loading branch information
fnagel committed Sep 30, 2011
1 parent bf7394e commit a9aef0974b7fca878e4a88d8a2e1beacc940eae5
Showing with 17 additions and 12 deletions.
  1. +5 −3 demos/selectmenu/default.html
  2. +3 −3 tests/visual/selectmenu/disabled.html
  3. +9 −6 ui/jquery.ui.selectmenu.js
@@ -17,11 +17,13 @@
$('select#speed').selectmenu({
dropdown: false
});
$('select#number').selectmenu({
dropdown: false,
wrapperElement: '<div class="overflow"/>'
var withOverflow = $('select#number').selectmenu({
dropdown: false
});
withOverflow.selectmenu("widget").addClass("overflow");

$('select#files').selectmenu();

});
</script>
<style>
@@ -17,10 +17,10 @@
$('select#speed').selectmenu({
dropdown: false
});
$('select#number').selectmenu({
dropdown: false,
wrapperElement: '<div class="overflow"/>'
var withOverflow = $('select#number').selectmenu({
dropdown: false
});
withOverflow.selectmenu("widget").addClass("overflow");
$('select#files').selectmenu();
var files2 = $('select#files2').selectmenu();

@@ -21,7 +21,6 @@ $.widget( "ui.selectmenu", {
defaultElement: "<select>",
options: {
dropdown: true,
wrapperElement: "<div />",
appendTo: "body",
position: {
my: "left top",
@@ -46,7 +45,7 @@ $.widget( "ui.selectmenu", {
// quick array of button and menu id's
that.ids = [ selectmenuId, selectmenuId + '-button', selectmenuId + '-menu' ];

// set current value
// set current value
if ( options.value ) {
that.element[0].value = options.value;
} else {
@@ -110,7 +109,7 @@ $.widget( "ui.selectmenu", {
});

// wrap and insert new button
that.newelementWrap = $( options.wrapperElement )
that.newelementWrap = $( '<div />' )
.append( that.newelement )
.insertAfter( that.element );
},
@@ -150,7 +149,7 @@ $.widget( "ui.selectmenu", {
});

// wrap list
that.listWrap = $( options.wrapperElement )
that.listWrap = $( '<div />' )
.addClass( that.widgetBaseClass + '-menu' )
.width( setWidth )
.append( that.list )
@@ -297,15 +296,15 @@ $.widget( "ui.selectmenu", {
li.append( $( "<a />", {
text: item.label,
href: '#'
})
})
);
}

return li.appendTo( ul );
},

_move: function( key, event ) {
// TODO this focus is needed to make the select below work,
// TODO this focus is needed to make the select below work,
// but should be removed as its fires an unwanted focus event
if ( !this.opened ) {
this.list.menu( "focus", event, this._getSelectedItem() );
@@ -405,6 +404,10 @@ $.widget( "ui.selectmenu", {
}
},

widget: function() {
return this.newelementWrap.add( this.listWrap );
},

_initSource: function() {
var data = [];
$.each( this.element.find( 'option' ), function( index, item ) {

0 comments on commit a9aef09

Please sign in to comment.
You can’t perform that action at this time.