X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=74fd6fcb3cdc8f18c095260fca6778caee92ac0a;hb=a27b5d0468acc5dd8cdfcbff9464546b353e3c04;hp=7db0a8c9b15654dc8359057bfc74669119947095;hpb=43c4b64f328c5d6f2642f6dcf33eb27c377c0491;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 7db0a8c..74fd6fc 100644
--- 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