From 7f8f3212985edd4150a23c659da068f581d5d7db Mon Sep 17 00:00:00 2001
From: Felix Nagel <info@felixnagel.com>
Date: Wed, 28 Sep 2011 22:22:36 +0200
Subject: Selectmenu: removed iconWidth

---
 ui/jquery.ui.selectmenu.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'ui/jquery.ui.selectmenu.js')

diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js
index 74ef8fa0a..10e543f42 100644
--- a/ui/jquery.ui.selectmenu.js
+++ b/ui/jquery.ui.selectmenu.js
@@ -21,7 +21,6 @@ $.widget( "ui.selectmenu", {
 	defaultElement: "<select>",
 	options: {
 		dropdown: true,
-		iconWidth: 26,
 		wrapperElement: "<div />",
 		appendTo: "body",
 		position: {
@@ -169,11 +168,16 @@ $.widget( "ui.selectmenu", {
 			id: self.ids[1]
 		});
 		
-		// wrap list
-		var newelementWidth = self.newelement.outerWidth();
+		// wrap list	
+		if ( options.dropdown ) {
+			var setWidth = self.newelement.outerWidth();
+		} else {
+			var text = self.newelement.find( "span.ui-button-text");
+			var setWidth = text.width() + parseFloat( text.css( "padding-left" ) ) + parseFloat( text.css( "margin-left" ) );
+		}		
 		self.listWrap = $( options.wrapperElement )
 			.addClass( self.widgetBaseClass + '-menu' )
-			.width( ( options.dropdown ) ? newelementWidth : newelementWidth - options.iconWidth )
+			.width( setWidth )
 			.append( self.list )
 			.appendTo( options.appendTo );
 		
-- 
cgit v1.2.3