X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=6f26fd0c664e8536372ae1bb50d60f09f387607f;hb=1970154c3b50d3cbc990b93b48d7448390bd84cf;hp=ad0da6469919b513d891712b95aba1a8c65ba41c;hpb=b3ccf2f2881d9ad988aba1cf3ccffb810063ab29;p=jquery.git

diff --git a/src/css.js b/src/css.js
index ad0da64..6f26fd0 100644
--- a/src/css.js
+++ b/src/css.js
@@ -25,7 +25,7 @@ jQuery.fn.css = function( name, value ) {
 		if ( value === undefined ) {
 			return jQuery.curCSS( elem, name );
 		}
-		
+
 		if ( typeof value === "number" && !rexclude.test(name) ) {
 			value += "px";
 		}
@@ -35,22 +35,30 @@ jQuery.fn.css = function( name, value ) {
 };
 
 jQuery.extend({
-	style: function( elem, name, value ) {
-		// 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;
-		}
+	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
+				}
 
-		var style = elem.style || elem, set = value !== undefined;
-
-		// 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;
@@ -60,12 +68,22 @@ jQuery.extend({
 				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( ropacity.exec(style.filter)[1] ) / 100) + "":
-				"";
+	style: function( elem, name, value ) {
+		// 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;
@@ -73,10 +91,19 @@ jQuery.extend({
 
 		name = name.replace(rdashAlpha, fcamelCase);
 
-		if ( set ) {
+		var hooks = jQuery.cssHooks[name] || {};
+
+		if ( set && (!("set" in hooks) || hooks.set( elem, value ) === false) ) {
 			style[ name ] = value;
 		}
 
+		if ( "get" in hooks ) {
+			var cssHookReturn = hooks.get( elem, false );
+			if ( cssHookReturn !== false ) {
+				return cssHookReturn;
+			}
+		}
+
 		return style[ name ];
 	},
 
@@ -98,24 +125,17 @@ jQuery.extend({
 	},
 
 	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 || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
-
-			return ret === "" ?
-				"1" :
-				ret;
-		}
+		var ret, style = elem.style, filter, hooks = jQuery.cssHooks[name] || {};
 
 		// Make sure we're using the right name for getting the float value
 		if ( rfloat.test( name ) ) {
 			name = styleFloat;
 		}
 
+		if ( "get" in hooks && ( ret = hooks.get( elem, force ) ) !== false ) {
+			return ret;
+		}
+
 		if ( !force && style && style[ name ] ) {
 			ret = style[ name ];