From: Felix Nagel <info@felixnagel.com>
Date: Fri, 20 Jul 2012 21:06:58 +0000 (+0200)
Subject: fixed: its now possible to have a disabled and selected option on init, see #234
X-Git-Tag: selectmenu_v1.2.2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=690fcb3c47037df49eccaed6f87293e9abe3abec;p=jquery-ui.git

fixed: its now possible to have a disabled and selected option on init, see #234
---

diff --git a/demos/selectmenu/disable_enable.html b/demos/selectmenu/disable_enable.html
index fd3191d78..b82941374 100644
--- a/demos/selectmenu/disable_enable.html
+++ b/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 @@
 			</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">
diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js
index 7b6e4e7cf..527d40eae 100644
--- a/ui/jquery.ui.selectmenu.js
+++ b/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');