Merge branch 'selectmenu' of github.com:fnagel/jquery-ui into selectmenu

Author: fnagel

demos/selectmenu/disable_enable.html

@@ -67,7 +67,9 @@
 
 			var speedC = $('select#speedC').selectmenu();
 
-			var speedD = $('select#speedD').selectmenu();		
+			var speedD = $('select#speedD').selectmenu();
+			
+			var speedD_first = $('select#speedD_first').selectmenu();		
 
 			var speedD2 = $('select#speedD2').selectmenu();				
 			$("#optgroupSwitch").toggle(
@@ -169,6 +171,16 @@ <h3>HTML</h3>
 			</select>
 		</fieldset>
 
+		<fieldset>
+			<label for="speedD_first">Disabled and selected first option by HTML</label>
+			<select id="speedD_first">
+				<option disabled="disabled" selected="selected">Choose one...</option>
+				<option>Option 1</option>
+				<option>Option 2</option>
+				<option>Option 3</option>
+			<select>
+		</fieldset>
+				
 		<fieldset>
 			<label for="speedD3">Disabled optgroup by HTML</label>
 			<select name="speedD3" id="speedD3">

ui/jquery.ui.selectmenu.js

@@ -436,7 +436,7 @@ $.widget("ui.selectmenu", {
 		}
 
 		// update value
-		this.index( this._selectedIndex() );
+		this._refreshValue();
 
 		// set selected item so movefocus has intial state
 		this._selectedOptionLi().addClass(this.widgetBaseClass + '-item-focus');
@@ -868,7 +868,7 @@ $.widget("ui.selectmenu", {
 				my: o.positionOptions.my,
 				at: o.positionOptions.at,
 				offset: o.positionOptions.offset || _offset,
-				collision: o.positionOptions.collision || o.style == "popup" ? 'fit' :'flip'
+				collision: o.positionOptions.collision || (o.style == "popup" ? 'fit' :'flip')
 			});
 	}
 });