Tagging the 1.5rc1 release.

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index 7d2cd8f..b067539 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
@@ -15,28 +15,39 @@ var elemdisplay = {},
 
 jQuery.fn.extend({
        show: function( speed, easing, callback ) {
+               var elem, display;
+
                if ( speed || speed === 0 ) {
                        return this.animate( genFx("show", 3), speed, easing, callback);
+
                } else {
                        for ( var i = 0, j = this.length; i < j; i++ ) {
+                               elem = this[i];
+                               display = elem.style.display;
+
                                // Reset the inline display of this element to learn if it is
                                // being hidden by cascaded rules or not
-                               if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
-                                       this[i].style.display = "";
+                               if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+                                       display = elem.style.display = "";
                                }
 
                                // Set elements which have been overridden with display: none
                                // in a stylesheet to whatever the default browser style is
                                // for such an element
-                               if ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
-                                       jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
+                               if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+                                       jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
                                }
                        }
 
                        // Set the display of most of the elements in a second loop
                        // to avoid the constant reflow
                        for ( i = 0; i < j; i++ ) {
-                               this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+                               elem = this[i];
+                               display = elem.style.display;
+
+                               if ( display === "" || display === "none" ) {
+                                       elem.style.display = jQuery._data(elem, "olddisplay") || "";
+                               }
                        }
 
                        return this;
@@ -51,8 +62,8 @@ jQuery.fn.extend({
                        for ( var i = 0, j = this.length; i < j; i++ ) {
                                var display = jQuery.css( this[i], "display" );
 
-                               if ( display !== "none" ) {
-                                       jQuery.data( this[i], "olddisplay", display );
+                               if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+                                       jQuery._data( this[i], "olddisplay", display );
                                }
                        }
 
@@ -101,7 +112,7 @@ jQuery.fn.extend({
                }
 
                return this[ optall.queue === false ? "each" : "queue" ](function() {
-                       // XXX ‘this’ does not always have a nodeName when running the
+                       // XXX 'this' does not always have a nodeName when running the
                        // test suite
 
                        var opt = jQuery.extend({}, optall), p,
@@ -174,7 +185,7 @@ jQuery.fn.extend({
 
                                } else {
                                        var parts = rfxnum.exec(val),
-                                               start = e.cur(true) || 0;
+                                               start = e.cur() || 0;
 
                                        if ( parts ) {
                                                var end = parseFloat( parts[2] ),
@@ -183,7 +194,7 @@ jQuery.fn.extend({
                                                // We need to compute starting value
                                                if ( unit !== "px" ) {
                                                        jQuery.style( self, name, (end || 1) + unit);
-                                                       start = ((end || 1) / e.cur(true)) * start;
+                                                       start = ((end || 1) / e.cur()) * start;
                                                        jQuery.style( self, name, start + unit);
                                                }
 
@@ -252,7 +263,8 @@ jQuery.each({
        slideUp: genFx("hide", 1),
        slideToggle: genFx("toggle", 1),
        fadeIn: { opacity: "show" },
-       fadeOut: { opacity: "hide" }
+       fadeOut: { opacity: "hide" },
+       fadeToggle: { opacity: "toggle" }
 }, function( name, props ) {
        jQuery.fn[ name ] = function( speed, easing, callback ) {
                return this.animate( props, speed, easing, callback );
@@ -325,11 +337,14 @@ 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
        custom: function( from, to, unit ) {
+               var self = this,
+                       fx = jQuery.fx;
+
                this.startTime = jQuery.now();
                this.start = from;
                this.end = to;
@@ -337,7 +352,6 @@ jQuery.fx.prototype = {
                this.now = this.start;
                this.pos = this.state = 0;
 
-               var self = this, fx = jQuery.fx;
                function t( gotoEnd ) {
                        return self.step(gotoEnd);
                }
@@ -394,7 +408,9 @@ jQuery.fx.prototype = {
                        if ( done ) {
                                // Reset the overflow
                                if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-                                       var elem = this.elem, options = this.options;
+                                       var elem = this.elem,
+                                               options = this.options;
+
                                        jQuery.each( [ "", "X", "Y" ], function (index, value) {
                                                elem.style[ "overflow" + value ] = options.overflow[index];
                                        } );