Add a feature test for options inside a disabled select. Follow-up to 157a383dae5335e...

[jquery.git] / src / support.js

diff --git a/src/support.js b/src/support.js
index 5821301..2015918 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -1,3 +1,5 @@
+(function( jQuery ) {
+
 (function() {
 
        jQuery.support = {};
@@ -5,7 +7,7 @@
        var root = document.documentElement,
                script = document.createElement("script"),
                div = document.createElement("div"),
-               id = "script" + now();
+               id = "script" + jQuery.now();
 
        div.style.display = "none";
        div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
@@ -18,6 +20,9 @@
                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,
@@ -54,18 +59,21 @@
 
                // Make sure that a selected-by-default option has a working selected property.
                // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-               optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
-
-               parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+               optSelected: opt.selected,
 
                // Will be defined later
-               deleteExpando: true,
+               optDisabled: false,
                checkClone: false,
                scriptEval: false,
                noCloneEvent: true,
                boxModel: null
        };
 
+       // Make sure that the options inside disabled selects aren't marked as disabled
+       // (WebKit marks them as diabled)
+       select.disabled = true;
+       jQuery.support.optDisabled = !opt.disabled;
+
        script.type = "text/javascript";
        try {
                script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
@@ -81,15 +89,6 @@
                delete window[ id ];
        }
 
-       // Test to see if it's possible to delete an expando from an element
-       // Fails in Internet Explorer
-       try {
-               delete script.test;
-       
-       } catch(e) {
-               jQuery.support.deleteExpando = false;
-       }
-
        root.removeChild( script );
 
        if ( div.attachEvent && div.fireEvent ) {
@@ -120,7 +119,6 @@
                document.body.appendChild( div );
                jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
                document.body.removeChild( div ).style.display = 'none';
-
                div = null;
        });
 
@@ -159,3 +157,5 @@ jQuery.props = {
        usemap: "useMap",
        frameborder: "frameBorder"
 };
+
+})( jQuery );