X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=081c5b4398510b18533f81e253944b5fc91febef;hb=0aa8d40cdfb50fd423a3bdcf585ac27f89df5b97;hp=c095f741a8886eeee1b4bf1a755ed3045a980e8e;hpb=69212c501f8875b4650847053cc41eaa470e5848;p=jquery.git

diff --git a/src/core.js b/src/core.js
index c095f74..081c5b4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -90,9 +90,6 @@ jQuery.fn = jQuery.prototype = {
 		return this.length;
 	},
 
-	// The number of elements contained in the matched element set
-	length: 0,
-
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
@@ -357,11 +354,13 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	val: function( value ) {
-		if ( value == undefined ) {
-
-			if ( this.length ) {
-				var elem = this[0];
+		if ( value == undefined ) {			
+			var elem = this[0];
 
+			if ( elem ) {
+				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 +378,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 )
@@ -390,11 +389,11 @@ jQuery.fn = jQuery.prototype = {
 						}
 					}
 
-					return values;
+					return values;				
+				}
 
 				// Everything else, we just grab the value
-				} else
-					return (this[0].value || "").replace(/\r/g, "");
+				return (elem.value || "").replace(/\r/g, "");
 
 			}
 
@@ -408,7 +407,7 @@ jQuery.fn = jQuery.prototype = {
 			if ( this.nodeType != 1 )
 				return;
 
-			if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+			if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
 				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
 					jQuery.inArray(this.name, value) >= 0);
 
@@ -613,10 +612,18 @@ jQuery.extend({
 	},
 
 	// See test/unit/core.js for details concerning this function.
-	// Since 1.3 DOM methods and function like alert
+	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
+	
+	// Memory leaks appear in IE6 when applying instanceof 
+	// to the window, document or any other COM object (#3485)
+	// http://ajaxian.com/archives/working-aroung-the-instanceof-memory-leak
 	isFunction: function( fn ) {
-		return fn instanceof Function;
+		return !!fn && !!fn.hasOwnProperty && fn instanceof Function;
+	},
+	
+	isArray: function( arr ){
+		return !!arr && arr.constructor == Array;
 	},
 
 	// check if an element is in a (or is an) XML document
@@ -1131,8 +1138,8 @@ jQuery.extend({
 
 		if( array != null ){
 			var i = array.length;
-			//the window, strings and functions also have 'length'
-			if( i == null || array.split || array.setInterval || array.call )
+			// The window, strings (and functions) also have 'length'
+			if( i == null || typeof array == 'string' || jQuery.isFunction(array) || array.setInterval )
 				ret[0] = array;
 			else
 				while( i )
@@ -1340,7 +1347,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 		// Get window width or height
 		return this[0] == window ?
 			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] ||
+			jQuery.browser.opera && document.body.parentNode[ "client" + name ] ||
 
 			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
 			jQuery.browser.safari && window[ "inner" + name ] ||