X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=bd6d929d5a4277dc96690efbb19a1b6a75de56b6;hb=5039a4bc5b951b9d28659f6f42f73c59e2e560fc;hp=ce2651963dbf0a48a07499106e07085e6da7d9e4;hpb=0a755f6ab38d36ffda02f9ff5a6d606c24a94baa;p=jquery.git

diff --git a/src/core.js b/src/core.js
index ce26519..bd6d929 100644
--- a/src/core.js
+++ b/src/core.js
@@ -396,7 +396,7 @@ jQuery.fn = jQuery.prototype = {
 					
 				// Everything else, we just grab the value
 				} else
-					return this[0].value.replace(/\r/g, "");
+					return (this[0].value || "").replace(/\r/g, "");
 
 			}
 
@@ -530,7 +530,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 	}
 
 	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target != "object" )
+	if ( typeof target != "object" && typeof target != "function" )
 		target = {};
 
 	// extend jQuery itself if only one argument is passed
@@ -549,7 +549,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// Recurse if we're merging object values
-				if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
+				if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
 					target[ name ] = jQuery.extend( target[ name ], options[ name ] );
 
 				// Don't bring in undefined values
@@ -591,7 +591,6 @@ jQuery.extend({
 	},
 
 	// Evalulates a script in a global context
-	// Evaluates Async. in Safari 2 :-(
 	globalEval: function( data ) {
 		data = jQuery.trim( data );
 
@@ -1042,7 +1041,8 @@ jQuery.extend({
 				if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
 					throw "type property can't be changed";
 
-				elem.setAttribute( name, value );
+				// convert the value to a string (all browsers do this but IE) see #1070
+				elem.setAttribute( name, "" + value );
 			}
 
 			if ( jQuery.browser.msie && /href|src/.test( name ) && !jQuery.isXMLDoc( elem ) )