X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=cd77ec1bd1bd3f3dfd88b5550c57f810c176f674;hb=920099b29c1157b637f918cdc293e1c89e9cd4dc;hp=dab3783f3001f29d86eac094503aa7532db09791;hpb=426045cc741b76ce95cf91ff5818879b3d067b76;p=jquery.git

diff --git a/src/css.js b/src/css.js
index dab3783..cd77ec1 100644
--- a/src/css.js
+++ b/src/css.js
@@ -11,6 +11,7 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	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,
@@ -22,203 +23,176 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 
 jQuery.fn.css = function( name, value ) {
 	return jQuery.access( this, name, value, true, function( elem, name, value ) {
-		if ( value === undefined ) {
-			return jQuery.curCSS( elem, name );
-		}
-
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
-
-		jQuery.style( elem, name, value );
+		jQuery.css( elem, name, value );
 	});
 };
 
 jQuery.extend({
-	cssHooks: {
-		opacity: {
-			get: function( elem, force ) {
-				var style = elem.style;
-
-				if ( jQuery.support.opacity && !style.filter ) {
-					return false; // move along, nothing to see here
-				}
-
-				// IE uses filters for opacity
-				var ret = ropacity.test(elem.currentStyle.filter || "") ?
-					(parseFloat(RegExp.$1) / 100) + "" :
-					"";
-
-				return ret === "" ?
-					"1" :
-					ret;
-			},
-
-			set: function( elem, value ) {
-				var style = elem.style;
-
-				if ( jQuery.support.opacity && !style.filter ) {
-					return false; // move along, nothing to see here
-				}
-
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
-
-				// 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;
-			}
-		}
-	},
+	cssHooks: {},
 
-	style: function( elem, name, value ) {
+	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 style = elem.style || elem, set = value !== undefined;
-
 		// Make sure we're using the right name for getting the float value
 		if ( rfloat.test( name ) ) {
 			name = styleFloat;
 		}
 
-		name = name.replace(rdashAlpha, fcamelCase);
+		name = name.replace( rdashAlpha, fcamelCase );
 
-		var hooks = jQuery.cssHooks[name] || {};
+		var ret, style = elem.style || {}, hooks = jQuery.cssHooks[name] || {};
 
-		if ( set && (!("set" in hooks) || hooks.set( elem, value ) === false) ) {
-			style[ name ] = value;
-		}
+		if ( value !== undefined ) {
+			if ( typeof value === "number" && !rexclude.test(name) ) {
+				value += "px";
+			}
 
-		if ( "get" in hooks ) {
-			var cssHookReturn = hooks.get( elem, false );
-			if ( cssHookReturn !== false ) {
-				return cssHookReturn;
+			if ( !("set" in hooks) || (value = hooks.set( elem, value )) === false ) {
+				style[ name ] = value;
 			}
-		}
 
-		return style[ name ];
-	},
+		} else {
+			if ( "get" in hooks && (ret = hooks.get( elem, force, extra )) !== false ) {
+				return ret;
+			}
 
-	css: function( elem, name, force, extra ) {
-		if ( name === "width" || name === "height" ) {
-			if ( elem.offsetWidth !== 0 ) {
-				val = getWH( elem, name, extra );
+			if ( !force && name in style ) {
+				ret = style[ name ];
 
-			} else {
-				jQuery.swap( elem, cssShow, function() {
-					val = getWH( elem, name, extra );
-				});
+			} else if ( curCSS ) {
+				ret = curCSS( elem, name );
 			}
 
-			return Math.max(0, Math.round(val));
+			return ret;
 		}
-
-		return jQuery.curCSS( elem, name, force );
 	},
 
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter, hooks = jQuery.cssHooks[name] || {};
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
+		// 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 ( "get" in hooks && ( ret = hooks.get( elem, force ) ) !== false ) {
-			return ret;
-		}
+		callback.call( elem );
 
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
 
-		} else if ( getComputedStyle ) {
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, force, extra ) {
+			if ( elem.offsetWidth !== 0 ) {
+				val = getWH( elem, name, extra );
 
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
+			} else {
+				jQuery.swap( elem, cssShow, function() {
+					val = getWH( elem, name, extra );
+				});
 			}
+		},
 
-			name = name.replace( rupper, "-$1" ).toLowerCase();
+		set: function( elem, value ) {
+			// ignore negative width and height values #1599
+			elem.style[ name ] = Math.max( parseFloat(value), 0 );
+		}
+	};
+});
 
-			var defaultView = elem.ownerDocument.defaultView;
+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";
+		},
 
-			if ( !defaultView ) {
-				return null;
-			}
+		set: function( elem, value ) {
+			var style = elem.style;
 
-			var computedStyle = defaultView.getComputedStyle( elem, null );
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
 
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
-			}
+			// Set the alpha filter to set the opacity
+			var opacity = parseInt( value, 10 ) + "" === "NaN" ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")";
 
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
-			}
+			var filter = style.filter || jQuery.css( elem, "filter" ) || "";
+
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				opacity;
+		}
+	};
+}
 
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
+if ( getComputedStyle ) {
+	curCSS = function( elem, name ) {
+		var ret, defaultView, computedStyle;
 
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+		// Only "float" is needed here
+		if ( rfloat.test( name ) ) {
+			name = "float";
+		}
 
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+		name = name.replace( rupper, "-$1" ).toLowerCase();
 
-			// 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 ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return null;
+		}
 
-				// 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";
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+		}
 
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
+		// We should always get a number back from opacity
+		if ( name === "opacity" && ret === "" ) {
+			ret = "1";
 		}
 
 		return ret;
-	},
+	};
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
+} else if ( document.documentElement.currentStyle ) {
+	curCSS = function( elem, name ) {
+		var left, rsLeft, ret = elem.currentStyle[ name ];
 
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-		callback.call( elem );
+		// 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;
 
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
+			// 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;
 		}
-	}
-});
+
+		return ret;
+	};
+}
 
 function getWH( elem, name, extra ) {
 	var which = name === "width" ? cssWidth : cssHeight,
@@ -230,14 +204,14 @@ function getWH( elem, name, extra ) {
 
 	jQuery.each( which, function() {
 		if ( !extra ) {
-			val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+			val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true)) || 0;
 		}
 
 		if ( extra === "margin" ) {
-			val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+			val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true)) || 0;
 
 		} else {
-			val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true)) || 0;
 		}
 	});
 
@@ -253,7 +227,7 @@ 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 ) {