X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=38caaf0aed9a8297981c0f191b10b763f580f4ec;hb=339789a931fbb01870b1ecd522e35bd439149292;hp=befaef64d03b903dcf1e8513525ca0fb365fcc8f;hpb=46806957f478d4f1435f13768cc85c1a39996d33;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index befaef6..38caaf0 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.nodeName(arg[0],"form") ) + if ( arg[0] == undefined || (jQuery.browser.msie && jQuery.nodeName(arg,"form")) ) r.push( arg ); else r = jQuery.merge( r, arg ); @@ -1525,7 +1525,8 @@ jQuery.extend({ // IE elem.getAttribute passes even for style else if ( elem.tagName ) { if ( value != undefined ) elem.setAttribute( name, value ); - if ( name == "href" && jQuery.browser.msie && !jQuery.isXMLDoc(elem) ) return elem.getAttribute( name, 2 ); + if ( jQuery.browser.msie && !jQuery.isXMLDoc(elem) && /^(href|src|background|cite|classid|codebase|data|longdesc|profile|usemap)$/.test(name) ) + return elem.getAttribute( name, 2 ); return elem.getAttribute( name ); // elem is actually elem.style ... set the style