Fixes a bug I introduced

[jquery.git] / src / css.js

diff --git a/src/css.js b/src/css.js
index 5dd8dd0..0f08227 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -17,51 +17,17 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
        };
 
 jQuery.fn.css = function( name, value ) {
-       var options = name, isFunction = jQuery.isFunction( value );
-
-       if ( typeof name === "string" ) {
-               // Are we setting the style?
-               if ( value === undefined ) {
-                       return this.length ?
-                               jQuery.css( this[0], name ) :
-                               null;
-
-               // Convert name, value params to options hash format
-               } else {
-                       options = {};
-                       options[ name ] = value;
+       return access( this, name, value, true, function( elem, name, value ) {
+               if (value === undefined) {
+                       return jQuery.css( elem, name );
                }
-       }
-       
-       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++ ) {
-               var elem = this[i];
-
-               // Set all the styles
-               for ( var prop in options ) {
-                       value = options[prop];
-
-                       if ( isFunction[prop] ) {
-                               value = value.call( elem, i );
-                       }
-
-                       if ( typeof value === "number" && !rexclude.test(prop) ) {
-                               value = value + "px";
-                       }
-
-                       jQuery.style( elem, prop, value );
+               
+               if ( typeof value === "number" && !rexclude.test(name) ) {
+                       value += "px";
                }
-       }
 
-       return this;
+               jQuery.style( elem, name, value );
+       });
 };
 
 jQuery.extend({
@@ -86,8 +52,9 @@ jQuery.extend({
                                style.zoom = 1;
 
                                // Set the alpha filter to set the opacity
-                               style.filter = (style.filter || "").replace( ralpha, "" ) +
-                                       (parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+                               var opacity = parseInt( value, 10 ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+                               var filter = style.filter || jQuery.curCSS( elem, 'filter' ) || "";
+                               style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
                        }
 
                        return style.filter && style.filter.indexOf("opacity=") >= 0 ?
@@ -201,7 +168,7 @@ jQuery.extend({
 
                                // Put in the new values to get a computed value out
                                elem.runtimeStyle.left = elem.currentStyle.left;
-                               style.left = ret || 0;
+                               style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
                                ret = style.pixelLeft + "px";
 
                                // Revert the changed values
@@ -231,3 +198,20 @@ jQuery.extend({
                }
        }
 });
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+       jQuery.expr.filters.hidden = function(elem){
+               var width = elem.offsetWidth, height = elem.offsetHeight,
+                        force = /^tr$/i.test( elem.nodeName ); // ticket #4512
+
+               return width === 0 && height === 0 && !force ?
+                       true :
+                               width !== 0 && height !== 0 && !force ?
+                                       false :
+                                               jQuery.curCSS(elem, "display") === "none";
+       };
+
+       jQuery.expr.filters.visible = function(elem){
+               return !jQuery.expr.filters.hidden(elem);
+       };
+}