X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=ae6853e9c0ce0748920d55f0282a09b6de88af7b;hb=bca576550249e9b79b1097669dff6d4ddd0d65cf;hp=7215fe620506884607f852a32c56b8d429f04ceb;hpb=4e9fed3b16ed9612ed373d14a89294e98054f4dd;p=jquery.git

diff --git a/src/css.js b/src/css.js
index 7215fe6..ae6853e 100644
--- a/src/css.js
+++ b/src/css.js
@@ -1,3 +1,5 @@
+(function( jQuery ) {
+
 // exclude the following css properties to add px
 var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	ralpha = /alpha\([^)]*\)/,
@@ -8,16 +10,20 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	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 ) {
-	return access( this, name, value, true, function( elem, name, value ) {
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
 		if ( value === undefined ) {
 			return jQuery.curCSS( elem, name );
 		}
@@ -45,20 +51,20 @@ jQuery.extend({
 		var style = elem.style || elem, set = value !== undefined;
 
 		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
+		if ( !jQuery.support.opacity && name === "opacity" && style.filter ) {
 			if ( set ) {
 				// 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' ) || "";
+				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( ropacity.exec(style.filter)[1] ) / 100) + '':
+				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
 				"";
 		}
 
@@ -78,30 +84,13 @@ 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" ];
-
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-				if ( extra === "border" ) { return; }
-
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
-
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
-
 			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));
@@ -141,7 +130,13 @@ jQuery.extend({
 
 			name = name.replace( rupper, "-$1" ).toLowerCase();
 
-			var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+			var defaultView = elem.ownerDocument.defaultView;
+
+			if ( !defaultView ) {
+				return null;
+			}
+
+			var computedStyle = defaultView.getComputedStyle( elem, null );
 
 			if ( computedStyle ) {
 				ret = computedStyle.getPropertyValue( name );
@@ -193,12 +188,36 @@ jQuery.extend({
 		callback.call( elem );
 
 		// Revert the old values
-		for ( var name in options ) {
+		for ( name in options ) {
 			elem.style[ name ] = old[ name ];
 		}
 	}
 });
 
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+		}
+	});
+
+	return val;
+}
+
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
 		var width = elem.offsetWidth, height = elem.offsetHeight,
@@ -215,3 +234,5 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 		return !jQuery.expr.filters.hidden( elem );
 	};
 }
+
+})( jQuery );