aboutsummaryrefslogtreecommitdiffstats
path: root/test/index.html
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2010-09-24 17:26:22 -0400
committerjeresig <jeresig@gmail.com>2010-09-24 17:26:22 -0400
commit2c4b20809e5d32e916c479c9b63a6b7528c880ce (patch)
tree88bf846405c1d52085cf4d9ec61010ca072a348f /test/index.html
parent700ff05af0d30722dcc23a69849bfb278fdc7e75 (diff)
downloadjquery-2c4b20809e5d32e916c479c9b63a6b7528c880ce.tar.gz
jquery-2c4b20809e5d32e916c479c9b63a6b7528c880ce.zip
Don't have .val() return selected-but-disabled options, or selected options inside a disabled optgroup. Doesn't change the .val() returned for a disabled select. Fixes #3240, adapted from Nathan Hammond's patch there.
Diffstat (limited to 'test/index.html')
-rw-r--r--test/index.html9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/index.html b/test/index.html
index 78060d464..5650a1d07 100644
--- a/test/index.html
+++ b/test/index.html
@@ -114,6 +114,15 @@
<option id="option3d" value="3">3</option>
<option id="option3e">no value</option>
</select>
+ <select name="select4" id="select4" multiple="multiple">
+ <optgroup disabled="disabled">
+ <option id="option4a" class="emptyopt" value="">Nothing</option>
+ <option id="option4b" disabled="disabled" selected="selected" value="1">1</option>
+ <option id="option4c" selected="selected" value="2">2</option>
+ </optgroup>
+ <option selected="selected" disabled="disabled" id="option4d" value="3">3</option>
+ <option id="option4e">no value</option>
+ </select>
<object id="object1" codebase="stupid">
<param name="p1" value="x1" />