aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-09-27 09:07:54 -0400
committerjeresig <jeresig@gmail.com>2010-09-27 09:07:54 -0400
commit157a383dae5335ef1056d3818d7dd70ac81c25a7 (patch)
tree3a288c2f24875fe20a1cd7aa747de0d43f2c555e /src
parent42aa714fb79199ad0a45d5f76f43729b399b058a (diff)
downloadjquery-157a383dae5335ef1056d3818d7dd70ac81c25a7.tar.gz
jquery-157a383dae5335ef1056d3818d7dd70ac81c25a7.zip
Bug fix for commit 2c4b20809e5d32e916c479c9b63a6b7528c880ce - technique wasn't working as expected in WebKit browsers. Thanks to @jitter for the bug fix.
Diffstat (limited to 'src')
-rw-r--r--src/attributes.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/attributes.js b/src/attributes.js
index fd3e38ace..608b8e339 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -164,7 +164,7 @@ jQuery.fn.extend({
var option = options[ i ];
// Don't return options that are disabled or in a disabled optgroup
- if ( option.selected && !option.disabled &&
+ if ( option.selected && option.getAttribute("disabled") === null &&
(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
// Get the specific value for the option
value = jQuery(option).val();