X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=5d31757b0537db1c761f75249462b883b97b17f6;hb=76236a15062aa82a4841748e9071eb3c9535ef62;hp=08230fc9a31d82805a891d20aac205bc60d1a015;hpb=4d1f15c35157532f13dd4ad2ba580ac65ad8475a;p=jquery.git

diff --git a/src/css.js b/src/css.js
index 08230fc..5d31757 100644
--- a/src/css.js
+++ b/src/css.js
@@ -1,59 +1,37 @@
 // exclude the following css properties to add px
-var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+	ralpha = /alpha\([^)]*\)/,
+	ropacity = /opacity=([^)]*)/,
+	rfloat = /float/i,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	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" && !exclude.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({
@@ -78,21 +56,22 @@ jQuery.extend({
 				style.zoom = 1;
 
 				// Set the alpha filter to set the opacity
-				style.filter = (style.filter || "").replace( /alpha\([^)]*\)/, "" ) +
-					(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 ?
-				(parseFloat( /opacity=([^)]*)/.exec(style.filter)[1] ) / 100) + '':
+				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
 				"";
 		}
 
 		// Make sure we're using the right name for getting the float value
-		if ( /float/i.test( name ) ) {
+		if ( rfloat.test( name ) ) {
 			name = styleFloat;
 		}
 
-		name = name.replace(/-([a-z])/ig, fcamelCase);
+		name = name.replace(rdashAlpha, fcamelCase);
 
 		if ( set ) {
 			style[ name ] = value;
@@ -103,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 ) {
@@ -140,7 +121,7 @@ jQuery.extend({
 
 		// IE uses filters for opacity
 		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = /opacity=([^)]*)/.test(elem.currentStyle.filter || "") ?
+			ret = ropacity.test(elem.currentStyle.filter || "") ?
 				(parseFloat(RegExp.$1) / 100) + "" :
 				"";
 
@@ -150,7 +131,7 @@ jQuery.extend({
 		}
 
 		// Make sure we're using the right name for getting the float value
-		if ( /float/i.test( name ) ) {
+		if ( rfloat.test( name ) ) {
 			name = styleFloat;
 		}
 
@@ -160,13 +141,19 @@ jQuery.extend({
 		} else if ( getComputedStyle ) {
 
 			// Only "float" is needed here
-			if ( /float/i.test( name ) ) {
+			if ( rfloat.test( name ) ) {
 				name = "float";
 			}
 
-			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+			name = name.replace( rupper, "-$1" ).toLowerCase();
+
+			var defaultView = elem.ownerDocument.defaultView;
+
+			if ( !defaultView ) {
+				return null;
+			}
 
-			var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+			var computedStyle = defaultView.getComputedStyle( elem, null );
 
 			if ( computedStyle ) {
 				ret = computedStyle.getPropertyValue( name );
@@ -178,7 +165,7 @@ jQuery.extend({
 			}
 
 		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(/\-(\w)/g, fcamelCase);
+			var camelCase = name.replace(rdashAlpha, fcamelCase);
 
 			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
 
@@ -187,13 +174,13 @@ jQuery.extend({
 
 			// If we're not dealing with a regular pixel number
 			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
 				// Remember the original values
 				var left = style.left, rsLeft = elem.runtimeStyle.left;
 
 				// 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
@@ -223,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 );
+	};
+}