Only perpetrate the .toJSON hack on data caches when they are attached to a plain...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index c73fd92..fd832ce 100644 (file)
--- 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,38 +505,17 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
-       var stylesheets = document.styleSheets,
-                       disabled = [],
-                       elem, display;
-
        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
-               jQuery.each( stylesheets, function( idx, obj ) { 
-                       disabled[ idx ] = obj.disabled;
-                       obj.disabled = true;
-               }); 
-               
-               // Create a temp element and check it's default display
-               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
-               jQuery.each( stylesheets, function( idx, obj ) {
-                       this.disabled = disabled[ idx ];
-               });
+               elemdisplay[ nodeName ] = display;
        }
 
        return elemdisplay[ nodeName ];