diff options
| author | jeresig <jeresig@gmail.com> | 2010-09-27 10:21:50 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2010-09-27 10:21:50 -0400 |
| commit | d558e9eb6f44783bb06666617c758408daf53e3d (patch) | |
| tree | b66730fb06c6c2639ff58b226deaf5e38725277b /src | |
| parent | 97d468fbf0f840f52c91855b0bc8db0ed6ac403c (diff) | |
| download | jquery-d558e9eb6f44783bb06666617c758408daf53e3d.tar.gz jquery-d558e9eb6f44783bb06666617c758408daf53e3d.zip | |
Some minor cleanup of the last commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/attributes.js | 2 | ||||
| -rw-r--r-- | src/support.js | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/attributes.js b/src/attributes.js index dd6a3e7ab..cb9f2cf5e 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 && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && + if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { // Get the specific value for the option diff --git a/src/support.js b/src/support.js index 201591893..d35dbed2d 100644 --- a/src/support.js +++ b/src/support.js @@ -13,16 +13,15 @@ div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>"; var all = div.getElementsByTagName("*"), - a = div.getElementsByTagName("a")[0]; + a = div.getElementsByTagName("a")[0], + select = document.createElement("select"), + opt = select.appendChild( document.createElement("option") ); // Can't get basic test support if ( !all || !all.length || !a ) { return; } - var select = document.createElement("select"); - var opt = select.appendChild( document.createElement("option") ); - jQuery.support = { // IE strips leading whitespace when .innerHTML is used leadingWhitespace: div.firstChild.nodeType === 3, |