summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-07-20 23:06:58 +0200
committerFelix Nagel <info@felixnagel.com>2012-07-20 23:06:58 +0200
commit690fcb3c47037df49eccaed6f87293e9abe3abec (patch)
tree4cd246ba4788ca29380229f7da54dc7527a9868f
parentc67774fe6ea7a7cffcec0acec2bedc070a3812d3 (diff)
downloadjquery-ui-690fcb3c47037df49eccaed6f87293e9abe3abec.tar.gz
jquery-ui-690fcb3c47037df49eccaed6f87293e9abe3abec.zip
fixed: its now possible to have a disabled and selected option on init, see #234
-rw-r--r--demos/selectmenu/disable_enable.html14
-rw-r--r--ui/jquery.ui.selectmenu.js2
2 files changed, 14 insertions, 2 deletions
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(
@@ -170,6 +172,16 @@
</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">
<optgroup label="scripts">
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');