X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=94a021b6ab48b3047057a5ac009b481ca1b4024d;hb=991dafae16e44512c5107b90bc8ce9675d8f5c12;hp=f77497b4fb3866e1d00353cb5cd2a00b86372e69;hpb=6a049246a123d7da75430f875e9eee1ba3270722;p=jquery.git diff --git a/src/css.js b/src/css.js index f77497b..94a021b 100644 --- a/src/css.js +++ b/src/css.js @@ -21,6 +21,13 @@ jQuery.fn.css = function( name, value ) { options[ name ] = value; } } + + var isFunction = {}; + + // For each value, determine whether it's a Function so we don't + // need to determine it again for each element + for ( var prop in options ) + isFunction[prop] = jQuery.isFunction( options[prop] ); // For each element... for ( var i = 0, l = this.length; i < l; i++ ) { @@ -30,9 +37,7 @@ jQuery.fn.css = function( name, value ) { for ( var prop in options ) { value = options[prop]; - if ( isFunction ) { - value = value.call( elem, i ); - } + if ( isFunction[prop] ) value = value.call( elem, i ); if ( typeof value === "number" && !exclude.test(prop) ) { value = value + "px"; @@ -120,12 +125,12 @@ jQuery.extend({ }, curCSS: function( elem, name, force ) { - var ret, style = elem.style; + var ret, style = elem.style, filter; // IE uses filters for opacity - if ( !jQuery.support.opacity && name == "opacity" ) { - ret = style.filter && style.filter.indexOf("opacity=") >= 0 ? - (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': + if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) { + ret = (elem.currentStyle.filter || "").match(/opacity=([^)]*)/) ? + (parseFloat(RegExp.$1) / 100) + "" : ""; return ret === "" ?