jquery core: closes #2652. val() supports option elements, also simplified the code.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 7db0a8c..74fd6fc 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -362,6 +362,9 @@ jQuery.fn = jQuery.prototype = {
                        if ( this.length ) {
                                var elem = this[0];
 
+                               if( jQuery.nodeName( elem, 'option' ) )
+                                       return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+                               
                                // We need to handle select boxes special
                                if ( jQuery.nodeName( elem, "select" ) ) {
                                        var index = elem.selectedIndex,
@@ -379,7 +382,7 @@ jQuery.fn = jQuery.prototype = {
 
                                                if ( option.selected ) {
                                                        // Get the specifc value for the option
-                                                       value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+                                                       value = jQuery(option).val();
 
                                                        // We don't need an array for one selects
                                                        if ( one )
@@ -613,9 +616,10 @@ jQuery.extend({
        },
 
        // See test/unit/core.js for details concerning this function.
+       // Since 1.3 DOM methods and function like alert
+       // aren't supported. They return false on IE (#2968).
        isFunction: function( fn ) {
-               return !!fn && typeof fn != "string" && !fn.nodeName &&
-                       fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
+               return fn instanceof Function;
        },
 
        // check if an element is in a (or is an) XML document