X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=56249598d5da2769ce5615d5aa555d1025193ad7;hb=a44ec402771f6d622506f39073d0be260400dd21;hp=c36b6dcc25225f777539fd39d81e8652c4768481;hpb=aae0617c834a030902cd8da2714f852d6a1431be;p=jquery.git

diff --git a/src/css.js b/src/css.js
index c36b6dc..5624959 100644
--- a/src/css.js
+++ b/src/css.js
@@ -1,203 +1,228 @@
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	ralpha = /alpha\([^)]*\)/,
+(function( jQuery ) {
+
+var 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" ],
+	curCSS,
+
 	// 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 ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if (value === undefined) {
-			return jQuery.css( elem, name );
-		}
-		
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
-
-		jQuery.style( elem, name, value );
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		jQuery.css( elem, name, value );
 	});
 };
 
 jQuery.extend({
-	style: function( elem, name, value ) {
+	cssHooks: {
+		opacity: {
+			get: function( elem ) {
+				// We should always get a number back from opacity
+				var ret = curCSS( elem, "opacity", "opacity" );
+				return ret === "" ? "1" : ret;
+			}
+		}
+	},
+
+	// exclude the following css properties to add px
+	cssNumber: {
+		"zIndex": true,
+		"fontWeight": true,
+		"opacity": true,
+		"zoom": true,
+		"lineHeight": true
+	},
+
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	css: function( elem, name, value, force, extra ) {
 		// don't set styles on text and comment nodes
 		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
 			return undefined;
 		}
 
-		// ignore negative width and height values #1599
-		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-			value = undefined;
-		}
+		var ret, origName = name.replace( rdashAlpha, fcamelCase ),
+			style = elem.style || {}, hooks = jQuery.cssHooks[ origName ] || {};
 
-		var style = elem.style || elem, set = value !== undefined;
+		name = jQuery.cssProps[ origName ] || origName;
 
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
+		if ( value !== undefined ) {
+			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
 
-				// Set the alpha filter to set the opacity
-				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;
+			if ( !("set" in hooks) || (value = hooks.set( elem, value )) === false ) {
+				style[ name ] = value;
 			}
 
-			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + '':
-				"";
-		}
+		} else {
+			if ( "get" in hooks && (ret = hooks.get( elem, force, extra )) !== false ) {
+				return ret;
+			}
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
+			if ( !force && name in style ) {
+				ret = style[ name ];
 
-		name = name.replace(rdashAlpha, fcamelCase);
+			} else if ( curCSS ) {
+				ret = curCSS( elem, name, origName );
+			}
 
-		if ( set ) {
-			style[ name ] = value;
+			return ret;
 		}
-
-		return style[ name ];
 	},
 
-	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" ];
-
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
 
-				if ( extra === "border" ) { return; }
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
 
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
+		callback.call( elem );
 
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
 
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, force, extra ) {
 			if ( elem.offsetWidth !== 0 ) {
-				getWH();
+				val = getWH( elem, name, extra );
+
 			} else {
-				jQuery.swap( elem, props, getWH );
+				jQuery.swap( elem, cssShow, function() {
+					val = getWH( elem, name, extra );
+				});
 			}
+		},
 
-			return Math.max(0, Math.round(val));
+		set: function( elem, value ) {
+			// ignore negative width and height values #1599
+			elem.style[ name ] = Math.max( parseFloat(value), 0 ) + "px";
 		}
+	};
+});
 
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = ropacity.test(elem.currentStyle.filter || "") ?
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, force ) {
+			// IE uses filters for opacity
+			return ropacity.test(elem.currentStyle.filter || "") ?
 				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
+				"1";
+		},
 
-			return ret === "" ?
-				"1" :
-				ret;
-		}
+		set: function( elem, value ) {
+			var style = elem.style;
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
 
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
+			// Set the alpha filter to set the opacity
+			var opacity = parseInt( value, 10 ) + "" === "NaN" ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")";
 
-		} else if ( getComputedStyle ) {
+			var filter = style.filter || jQuery.css( elem, "filter" ) || "";
 
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
-			}
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				opacity;
+		}
+	};
+}
 
-			name = name.replace( rupper, "-$1" ).toLowerCase();
+if ( getComputedStyle ) {
+	curCSS = function( elem, newName, name ) {
+		var ret, defaultView, computedStyle;
 
-			var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		name = name.replace( rupper, "-$1" ).toLowerCase();
 
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
-			}
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
 
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
-			}
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+		}
 
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
+		return ret;
+	};
 
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+} else if ( document.documentElement.currentStyle ) {
+	curCSS = function( elem, name ) {
+		var left, rsLeft, ret = elem.currentStyle[ name ];
 
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-			// 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 ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
+		// 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 ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			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 = camelCase === "fontSize" ? "1em" : (ret || 0);
-				ret = style.pixelLeft + "px";
+			// Put in the new values to get a computed value out
+			elem.runtimeStyle.left = elem.currentStyle.left;
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
 
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
+			// Revert the changed values
+			style.left = left;
+			elem.runtimeStyle.left = rsLeft;
 		}
 
 		return ret;
-	},
+	};
+}
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
 
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true)) || 0;
 		}
 
-		callback.call( elem );
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true)) || 0;
 
-		// Revert the old values
-		for ( var name in options ) {
-			elem.style[ name ] = old[ name ];
+		} else {
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true)) || 0;
 		}
-	}
-});
+	});
+
+	return val;
+}
 
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
@@ -208,10 +233,12 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 			true :
 			width > 0 && height > 0 && !skip ?
 				false :
-				jQuery.curCSS(elem, "display") === "none";
+				jQuery.css(elem, "display") === "none";
 	};
 
 	jQuery.expr.filters.visible = function( elem ) {
 		return !jQuery.expr.filters.hidden( elem );
 	};
 }
+
+})( jQuery );