Add missing semicolon.

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index bac2e1d..bebcc43 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -2,7 +2,7 @@
 
 var elemdisplay = {},
        rfxtypes = /^(?:toggle|show|hide)$/,
-       rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+       rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
        timerId,
        fxAttrs = [
                // height animations
@@ -27,7 +27,7 @@ jQuery.fn.extend({
 
                                // Reset the inline display of this element to learn if it is
                                // being hidden by cascaded rules or not
-                               if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+                               if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
                                        display = elem.style.display = "";
                                }
 
@@ -35,7 +35,7 @@ jQuery.fn.extend({
                                // in a stylesheet to whatever the default browser style is
                                // for such an element
                                if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
-                                       jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+                                       jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
                                }
                        }
 
@@ -46,7 +46,7 @@ jQuery.fn.extend({
                                display = elem.style.display;
 
                                if ( display === "" || display === "none" ) {
-                                       elem.style.display = jQuery.data(elem, "olddisplay") || "";
+                                       elem.style.display = jQuery._data(elem, "olddisplay") || "";
                                }
                        }
 
@@ -61,10 +61,10 @@ jQuery.fn.extend({
                } else {
                        for ( var i = 0, j = this.length; i < j; i++ ) {
                                var display = jQuery.css( this[i], "display" );
-        
-                               if ( !jQuery.data( this[i], "olddisplay" ) && display !== "none" ) {
-                                         jQuery.data( this[i], "olddisplay", display );
-                         }                               
+
+                               if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+                                       jQuery._data( this[i], "olddisplay", display );
+                               }
                        }
 
                        // Set the display of the elements in a second loop
@@ -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" ) {
@@ -337,7 +337,7 @@ jQuery.fx.prototype = {
                }
 
                var r = parseFloat( jQuery.css( this.elem, this.prop ) );
-               return r && r > -10000 ? r : 0;
+               return r || 0;
        },
 
        // Start an animation from one number to another
@@ -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 ];