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

diff --git a/src/css.js b/src/css.js
index 08230fc..f47bc8e 100644
--- a/src/css.js
+++ b/src/css.js
@@ -1,5 +1,13 @@
 // 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/,
+
 	// cache check for defaultView.getComputedStyle
 	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
 	// normalize float css property
@@ -9,51 +17,17 @@ var exclude = /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" && !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 +52,21 @@ jQuery.extend({
 				style.zoom = 1;
 
 				// Set the alpha filter to set the opacity
-				style.filter = (style.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+				style.filter = (style.filter || "").replace( ralpha, "" ) +
 					(parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
 			}
 
 			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;
@@ -140,7 +114,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 +124,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,11 +134,11 @@ 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 computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
 
@@ -178,7 +152,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,7 +161,7 @@ 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;