Merge branch 'jquerymaster' of http://github.com/SlexAxton/jquery into SlexAxton...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index 8c0985b..44a7942 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -49,9 +49,10 @@ jQuery.fn.extend({
 
                } else {
                        for ( var i = 0, j = this.length; i < j; i++ ) {
-                               var old = jQuery.data(this[i], "olddisplay");
-                               if ( !old ) {
-                                       jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
+                               var display = jQuery.css( this[i], "display" );
+
+                               if ( display !== "none" ) {
+                                       jQuery.data( this[i], "olddisplay", display );
                                }
                        }
 
@@ -173,7 +174,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] ),
@@ -182,7 +183,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);
                                                }
 
@@ -251,7 +252,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 );