From d558e9eb6f44783bb06666617c758408daf53e3d Mon Sep 17 00:00:00 2001 From: jeresig Date: Mon, 27 Sep 2010 10:21:50 -0400 Subject: [PATCH] Some minor cleanup of the last commit. --- src/attributes.js | 2 +- src/support.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/attributes.js b/src/attributes.js index dd6a3e7..cb9f2cf 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 2015918..d35dbed 100644 --- a/src/support.js +++ b/src/support.js @@ -13,16 +13,15 @@ div.innerHTML = "
a"; 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, -- 1.7.10.4