X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Feffects.js;h=58a15139cfc7dbb9ef93e1e68c759c396217d941;hb=6b08d88d04f4a41849753999e6e18126895086d0;hp=b0675395f45ac8d2ab5eb6d366da3b5d0bf42186;hpb=8e59a99e0ade75dec434f246f52e8b3f7393f359;p=jquery.git

diff --git a/src/effects.js b/src/effects.js
index b067539..58a1513 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -189,7 +189,7 @@ jQuery.fn.extend({
 
 					if ( parts ) {
 						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
+							unit = parts[3] || ( jQuery.cssNumber[ name ] ? "" : "px" );
 
 						// We need to compute starting value
 						if ( unit !== "px" ) {
@@ -348,7 +348,7 @@ jQuery.fx.prototype = {
 		this.startTime = jQuery.now();
 		this.start = from;
 		this.end = to;
-		this.unit = unit || this.unit || "px";
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
 		this.now = this.start;
 		this.pos = this.state = 0;
 
@@ -505,17 +505,42 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
+	var stylesheets = document.styleSheets,
+			disabled = [],
+			elem, display, style, idx;
+
 	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
 
+		// #8099 - If the end-dev has globally changed a default
+		// display, we can temporarily disable their styles to check
+		// for the correct default value
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			style = stylesheets[ idx ];
+			disabled[ idx ] = style.disabled;
+			style.disabled = true;
+		}
+
+		// To accurately check an element's default display value,
+		// create a temp element and check it's default display, this
+		// will ensure that the value returned is not a user-tampered
+		// value.
+		elem = jQuery("<" + nodeName + ">").appendTo("body");
+		display = elem.css("display");
+
+		// Remove temp element
 		elem.remove();
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
 		}
 
+		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
+
+		// Restore stylesheets
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			stylesheets[ idx ].disabled = disabled[ idx ];
+		}
 	}
 
 	return elemdisplay[ nodeName ];