X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=ce487a10f4d10bdc48bf01a940ef46d277d1c25c;hb=76e3a901530609d3c4a695ccb8a48251445c6861;hp=0ebc61dff1447095bb67615e4ac9bf8c71d4dce7;hpb=5c6c99361f315bfbc5829be3af94499c3a107f5d;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 0ebc61d..ce487a1 100644
--- a/src/core.js
+++ b/src/core.js
@@ -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 );
 
@@ -918,6 +917,8 @@ jQuery.extend({
 	clean: function( elems, context ) {
 		var ret = [];
 		context = context || document;
+		if (!context.createElement) 
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
 		jQuery.each(elems, function(i, elem){
 			if ( !elem )
@@ -1042,7 +1043,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 ) ) 
@@ -1064,7 +1066,7 @@ jQuery.extend({
 						(parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
 				}
 	
-				return elem.filter ? 
+				return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
 					(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
 					"";
 			}