Made a number of spacing changes to bring the code more-inline with the jQuery Core...

[jquery.git] / src / css.js

diff --git a/src/css.js b/src/css.js
index 5dd8dd0..e52e453 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -5,63 +5,33 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
        rfloat = /float/i,
        rdashAlpha = /-([a-z])/ig,
        rupper = /([A-Z])/g,
-       rnumpx = /^\d+(?:px)?$/i,
-       rnum = /^\d/,
+       rnumpx = /^-?\d+(?:px)?$/i,
+       rnum = /^-?\d/,
+
+       cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+       cssWidth = [ "Left", "Right" ],
+       cssHeight = [ "Top", "Bottom" ],
 
        // cache check for defaultView.getComputedStyle
        getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
        // normalize float css property
        styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-       fcamelCase = function(all, letter){
+       fcamelCase = function( all, letter ) {
                return letter.toUpperCase();
        };
 
 jQuery.fn.css = function( name, value ) {
-       var options = name, isFunction = jQuery.isFunction( value );
-
-       if ( typeof name === "string" ) {
-               // Are we setting the style?
+       return access( this, name, value, true, function( elem, name, value ) {
                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 jQuery.curCSS( 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 +56,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 ?
@@ -111,12 +82,14 @@ jQuery.extend({
 
        css: function( elem, name, force, extra ) {
                if ( name === "width" || name === "height" ) {
-                       var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name === "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+                       var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
 
                        function getWH() {
                                val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
 
-                               if ( extra === "border" ) { return; }
+                               if ( extra === "border" ) {
+                                       return;
+                               }
 
                                jQuery.each( which, function() {
                                        if ( !extra ) {
@@ -174,7 +147,13 @@ jQuery.extend({
 
                        name = name.replace( rupper, "-$1" ).toLowerCase();
 
-                       var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+                       var defaultView = elem.ownerDocument.defaultView;
+
+                       if ( !defaultView ) {
+                               return null;
+                       }
+
+                       var computedStyle = defaultView.getComputedStyle( elem, null );
 
                        if ( computedStyle ) {
                                ret = computedStyle.getPropertyValue( name );
@@ -201,7 +180,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 +210,20 @@ jQuery.extend({
                }
        }
 });
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+       jQuery.expr.filters.hidden = function( elem ) {
+               var width = elem.offsetWidth, height = elem.offsetHeight,
+                       skip = elem.nodeName.toLowerCase() === "tr";
+
+               return width === 0 && height === 0 && !skip ?
+                       true :
+                       width > 0 && height > 0 && !skip ?
+                               false :
+                               jQuery.curCSS(elem, "display") === "none";
+       };
+
+       jQuery.expr.filters.visible = function( elem ) {
+               return !jQuery.expr.filters.hidden( elem );
+       };
+}