X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e1840a6bf4c75f4ebfd512b4e6f0663ac3d318a6;hb=4259b02c99202092d222fc7ca19c1ab83df7eafa;hp=3693ee373a0623ac8fb379552a472725ee38fbdb;hpb=81f138d77e92e4deb6057cead988ebb679370973;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 3693ee3..e1840a6 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1280,7 +1280,7 @@ jQuery.extend({
 	prop: function(elem, value, type, index, prop){
 			// Handle executable functions
 			if ( jQuery.isFunction( value ) )
-				return value.call( elem, [index] );
+				value = value.call( elem, [index] );
 				
 			// exclude the following css properties to add px
 			var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
@@ -1470,7 +1470,7 @@ jQuery.extend({
 			if ( arg.length === 0 )
 				return;
 			
-			if ( arg[0] == undefined || (jQuery.browser.msie && jQuery.nodeName(arg,"form")) )
+			if ( arg[0] == undefined )
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );
@@ -1495,8 +1495,6 @@ jQuery.extend({
 			selected: "selected"
 		};
 		
-		var fixIE = jQuery.isXMLDoc(elem) ? [] : "href,src,background,cite,classid,codebase,data,longdesc,profile,usemap".split(',');
-		
 		// IE actually uses filters for opacity ... elem is actually elem.style
 		if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
 			// IE has trouble with opacity if it does not have layout
@@ -1527,7 +1525,8 @@ jQuery.extend({
 		// IE elem.getAttribute passes even for style
 		else if ( elem.tagName ) {
 			if ( value != undefined ) elem.setAttribute( name, value );
-			if ( jQuery.browser.msie && fixIE[name] ) return elem.getAttribute( name, 2 );
+			if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
+				return elem.getAttribute( name, 2 );
 			return elem.getAttribute( name );
 
 		// elem is actually elem.style ... set the style