Massive FX rewrite. Full list of changes:
[jquery.git] / src / fx / fx.js
index ece0cea..9fde6b9 100644 (file)
 jQuery.fn.extend({
-
-       /**
-        * Displays each of the set of matched elements if they are hidden.
-        *
-        * @example $("p").show()
-        * @before <p style="display: none">Hello</p>
-        * @result [ <p style="display: block">Hello</p> ]
-        *
-        * @name show
-        * @type jQuery
-        * @cat Effects
-        */
-       
-       /**
-        * Show all matched elements using a graceful animation and firing an
-        * optional callback after completion.
-        *
-        * The height, width, and opacity of each of the matched elements 
-        * are changed dynamically according to the specified speed.
-        *
-        * @example $("p").show("slow");
-        *
-        * @example $("p").show("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name show
-        * @type jQuery
-        * @param String|Number speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see hide(String|Number,Function)
-        */
        show: function(speed,callback){
-               var hidden = this.filter(":hidden");
-               speed ?
-                       hidden.animate({
+               return speed ?
+                       this.animate({
                                height: "show", width: "show", opacity: "show"
                        }, speed, callback) :
                        
-                       hidden.each(function(){
+                       this.filter(":hidden").each(function(){
                                this.style.display = this.oldblock ? this.oldblock : "";
                                if ( jQuery.css(this,"display") == "none" )
                                        this.style.display = "block";
-                       });
-               return this;
+                       }).end();
        },
        
-       /**
-        * Hides each of the set of matched elements if they are shown.
-        *
-        * @example $("p").hide()
-        * @before <p>Hello</p>
-        * @result [ <p style="display: none">Hello</p> ]
-        *
-        * @name hide
-        * @type jQuery
-        * @cat Effects
-        */
-       
-       /**
-        * Hide all matched elements using a graceful animation and firing an
-        * optional callback after completion.
-        *
-        * The height, width, and opacity of each of the matched elements 
-        * are changed dynamically according to the specified speed.
-        *
-        * @example $("p").hide("slow");
-        *
-        * @example $("p").hide("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name hide
-        * @type jQuery
-        * @param String|Number speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see show(String|Number,Function)
-        */
        hide: function(speed,callback){
-               var visible = this.filter(":visible");
-               speed ?
-                       visible.animate({
+               return speed ?
+                       this.animate({
                                height: "hide", width: "hide", opacity: "hide"
                        }, speed, callback) :
                        
-                       visible.each(function(){
+                       this.filter(":visible").each(function(){
                                this.oldblock = this.oldblock || jQuery.css(this,"display");
                                if ( this.oldblock == "none" )
                                        this.oldblock = "block";
                                this.style.display = "none";
-                       });
-               return this;
+                       }).end();
        },
 
        // Save the old toggle function
        _toggle: jQuery.fn.toggle,
        
-       /**
-        * Toggles each of the set of matched elements. If they are shown,
-        * toggle makes them hidden. If they are hidden, toggle
-        * makes them shown.
-        *
-        * @example $("p").toggle()
-        * @before <p>Hello</p><p style="display: none">Hello Again</p>
-        * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
-        *
-        * @name toggle
-        * @type jQuery
-        * @cat Effects
-        */
        toggle: function( fn, fn2 ){
-               var args = arguments;
-               return fn && fn.constructor == Function && fn2 && fn2.constructor == Function ?
+               return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
                        this._toggle( fn, fn2 ) :
-                       this.each(function(){
-                               jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]
-                                       .apply( jQuery(this), args );
-                       });
+                       fn ?
+                               this.animate({
+                                       height: "toggle", width: "toggle", opacity: "toggle"
+                               }, fn, fn2) :
+                               this.each(function(){
+                                       jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+                               });
        },
        
-       /**
-        * Reveal all matched elements by adjusting their height and firing an
-        * optional callback after completion.
-        *
-        * Only the height is adjusted for this animation, causing all matched
-        * elements to be revealed in a "sliding" manner.
-        *
-        * @example $("p").slideDown("slow");
-        *
-        * @example $("p").slideDown("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name slideDown
-        * @type jQuery
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see slideUp(String|Number,Function)
-        * @see slideToggle(String|Number,Function)
-        */
        slideDown: function(speed,callback){
                return this.animate({height: "show"}, speed, callback);
        },
        
-       /**
-        * Hide all matched elements by adjusting their height and firing an
-        * optional callback after completion.
-        *
-        * Only the height is adjusted for this animation, causing all matched
-        * elements to be hidden in a "sliding" manner.
-        *
-        * @example $("p").slideUp("slow");
-        *
-        * @example $("p").slideUp("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name slideUp
-        * @type jQuery
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see slideDown(String|Number,Function)
-        * @see slideToggle(String|Number,Function)
-        */
        slideUp: function(speed,callback){
                return this.animate({height: "hide"}, speed, callback);
        },
 
-       /**
-        * Toggle the visibility of all matched elements by adjusting their height and firing an
-        * optional callback after completion.
-        *
-        * Only the height is adjusted for this animation, causing all matched
-        * elements to be hidden in a "sliding" manner.
-        *
-        * @example $("p").slideToggle("slow");
-        *
-        * @example $("p").slideToggle("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name slideToggle
-        * @type jQuery
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see slideDown(String|Number,Function)
-        * @see slideUp(String|Number,Function)
-        */
        slideToggle: function(speed, callback){
-               return this.each(function(){
-                       var state = jQuery(this).is(":hidden") ? "show" : "hide";
-                       jQuery(this).animate({height: state}, speed, callback);
-               });
+               return this.animate({height: "toggle"}, speed, callback);
        },
        
-       /**
-        * Fade in all matched elements by adjusting their opacity and firing an
-        * optional callback after completion.
-        *
-        * Only the opacity is adjusted for this animation, meaning that
-        * all of the matched elements should already have some form of height
-        * and width associated with them.
-        *
-        * @example $("p").fadeIn("slow");
-        *
-        * @example $("p").fadeIn("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name fadeIn
-        * @type jQuery
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see fadeOut(String|Number,Function)
-        * @see fadeTo(String|Number,Number,Function)
-        */
        fadeIn: function(speed, callback){
                return this.animate({opacity: "show"}, speed, callback);
        },
        
-       /**
-        * Fade out all matched elements by adjusting their opacity and firing an
-        * optional callback after completion.
-        *
-        * Only the opacity is adjusted for this animation, meaning that
-        * all of the matched elements should already have some form of height
-        * and width associated with them.
-        *
-        * @example $("p").fadeOut("slow");
-        *
-        * @example $("p").fadeOut("slow",function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name fadeOut
-        * @type jQuery
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see fadeIn(String|Number,Function)
-        * @see fadeTo(String|Number,Number,Function)
-        */
        fadeOut: function(speed, callback){
                return this.animate({opacity: "hide"}, speed, callback);
        },
        
-       /**
-        * Fade the opacity of all matched elements to a specified opacity and firing an
-        * optional callback after completion.
-        *
-        * Only the opacity is adjusted for this animation, meaning that
-        * all of the matched elements should already have some form of height
-        * and width associated with them.
-        *
-        * @example $("p").fadeTo("slow", 0.5);
-        *
-        * @example $("p").fadeTo("slow", 0.5, function(){
-        *   alert("Animation Done.");
-        * });
-        *
-        * @name fadeTo
-        * @type jQuery
-        * @param String|Number speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param Number opacity The opacity to fade to (a number from 0 to 1).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        * @see fadeIn(String|Number,Function)
-        * @see fadeOut(String|Number,Function)
-        */
        fadeTo: function(speed,to,callback){
                return this.animate({opacity: to}, speed, callback);
        },
        
-       /**
-        * A function for making your own, custom, animations. The key aspect of
-        * this function is the object of style properties that will be animated,
-        * and to what end. Each key within the object represents a style property
-        * that will also be animated (for example: "height", "top", or "opacity").
-        *
-        * The value associated with the key represents to what end the property
-        * will be animated. If a number is provided as the value, then the style
-        * property will be transitioned from its current state to that new number.
-        * Oterwise if the string "hide", "show", or "toggle" is provided, a default
-        * animation will be constructed for that property.
-        *
-        * @example $("p").animate({
-        *   height: 'toggle', opacity: 'toggle'
-        * }, "slow");
-        *
-        * @example $("p").animate({
-        *   left: 50, opacity: 'show'
-        * }, 500);
-        *
-        * @example $("p").animate({
-        *   opacity: 'show'
-        * }, "slow", "easein");
-        * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery).
-        *
-        * @name animate
-        * @type jQuery
-        * @param Hash params A set of style attributes that you wish to animate, and to what end.
-        * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
-        * @param String easing (optional) The name of the easing effect that you want to use (Plugin Required).
-        * @param Function callback (optional) A function to be executed whenever the animation completes.
-        * @cat Effects
-        */
        animate: function( prop, speed, easing, callback ) {
-               return this.queue(function(){
-               
-                       this.curAnim = jQuery.extend({}, prop);
-                       var opt = jQuery.speed(speed, easing, callback);
+               var opt = jQuery.speed(speed, easing, callback);
+
+               return this[ opt.queue === false ? "each" : "queue" ](function(){
+                       opt = jQuery.extend({}, opt);
+                       var hidden = jQuery(this).is(":hidden"), self = this;
                        
                        for ( var p in prop ) {
-                               var e = new jQuery.fx( this, opt, p );
-                               if ( prop[p].constructor == Number )
-                                       e.custom( e.cur(), prop[p] );
-                               else
-                                       e[ prop[p] ]( prop );
+                               if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+                                       return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+                               if ( p == "height" || p == "width" ) {
+                                       // Store display property
+                                       opt.display = jQuery.css(this, "display");
+
+                                       // Make sure that nothing sneaks out
+                                       opt.overflow = this.style.overflow;
+                               }
                        }
+
+                       if ( opt.overflow != null )
+                               this.style.overflow = "hidden";
+
+                       opt.curAnim = jQuery.extend({}, prop);
                        
+                       jQuery.each( prop, function(name, val){
+                               var e = new jQuery.fx( self, opt, name );
+
+                               if ( /toggle|show|hide/.test(val) )
+                                       e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+                               else {
+                                       var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
+                                               start = e.cur(true) || 0;
+
+                                       if ( parts ) {
+                                               end = parseFloat(parts[2]),
+                                               unit = parts[3] || "px";
+
+                                               // We need to compute starting value
+                                               if ( unit != "px" ) {
+                                                       self.style[ name ] = end + unit;
+                                                       start = (end / e.cur(true)) * start;
+                                                       self.style[ name ] = start + unit;
+                                               }
+
+                                               // If a +/- token was provided, we're doing a relative animation
+                                               if ( parts[1] )
+                                                       end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+
+                                               e.custom( start, end, unit );
+                                       } else
+                                               e.custom( start, val, "" );
+                               }
+                       });
+
+                       // For JS strict compliance
+                       return true;
                });
        },
        
-       /**
-        *
-        * @private
-        */
-       queue: function(type,fn){
+       queue: function(type, fn){
                if ( !fn ) {
                        fn = type;
                        type = "fx";
                }
-       
+
+               if ( !arguments.length )
+                       return queue( this[0], type );
+
                return this.each(function(){
-                       if ( !this.queue )
-                               this.queue = {};
-       
-                       if ( !this.queue[type] )
-                               this.queue[type] = [];
-       
-                       this.queue[type].push( fn );
-               
-                       if ( this.queue[type].length == 1 )
-                               fn.apply(this);
+                       if ( fn.constructor == Array )
+                               queue(this, type, fn);
+                       else {
+                               queue(this, type).push( fn );
+                       
+                               if ( queue(this, type).length == 1 )
+                                       fn.apply(this);
+                       }
+               });
+       },
+
+       dequeue: function(type){
+               type = type || "fx";
+
+               return this.each(function(){
+                       var q = queue(this, type);
+
+                       q.shift();
+
+                       if ( q.length )
+                               q[0].apply( this );
+               });
+       },
+
+       stop: function(){
+               var timers = jQuery.timers;
+
+               return this.each(function(){
+                       for ( var i = 0; i < timers.length; i++ )
+                               if ( timers[i].elem == this )
+                                       timers.splice(i--, 1);
                });
        }
 
 });
 
+function queue( elem, type, array ) {
+       if ( !elem )
+               return;
+
+       if ( !elem.queue )
+               elem.queue = {};
+
+       if ( !elem.queue[type] )
+               elem.queue[type] = [];
+
+       if ( array )
+               elem.queue[type] = jQuery.makeArray(array);
+
+       return elem.queue[type];
+}
+
 jQuery.extend({
        
        speed: function(speed, easing, fn) {
                var opt = speed && speed.constructor == Object ? speed : {
                        complete: fn || !fn && easing || 
-                               speed && speed.constructor == Function && speed,
+                               jQuery.isFunction( speed ) && speed,
                        duration: speed,
                        easing: fn && easing || easing && easing.constructor != Function && easing
                };
@@ -369,201 +202,196 @@ jQuery.extend({
                        { slow: 600, fast: 200 }[opt.duration]) || 400;
        
                // Queueing
-               opt.oldComplete = opt.complete;
+               opt.old = opt.complete;
                opt.complete = function(){
-                       jQuery.dequeue(this, "fx");
-                       if ( opt.oldComplete && opt.oldComplete.constructor == Function )
-                               opt.oldComplete.apply( this );
+                       jQuery(this).dequeue();
+                       if ( jQuery.isFunction( opt.old ) )
+                               opt.old.apply( this );
                };
        
                return opt;
        },
        
-       easing: {},
-       
-       queue: {},
-       
-       dequeue: function(elem,type){
-               type = type || "fx";
-       
-               if ( elem.queue && elem.queue[type] ) {
-                       // Remove self
-                       elem.queue[type].shift();
-       
-                       // Get next function
-                       var f = elem.queue[type][0];
-               
-                       if ( f ) f.apply( elem );
+       easing: {
+               linear: function( p, n, firstNum, diff ) {
+                       return firstNum + diff * p;
+               },
+               swing: function( p, n, firstNum, diff ) {
+                       return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
                }
        },
-
-       /*
-        * I originally wrote fx() as a clone of moo.fx and in the process
-        * of making it small in size the code became illegible to sane
-        * people. You've been warned.
-        */
        
+       timers: [],
+
        fx: function( elem, options, prop ){
+               this.options = options;
+               this.elem = elem;
+               this.prop = prop;
 
-               var z = this;
+               if ( !options.orig )
+                       options.orig = {};
+       }
 
-               // The styles
-               var y = elem.style;
-               
-               // Store display property
-               var oldDisplay = jQuery.css(elem, 'display');
-               // Set display property to block for animation
-               y.display = "block";
-               // Make sure that nothing sneaks out
-               y.overflow = "hidden";
-
-               // Simple function for setting a style value
-               z.a = function(){
-                       if ( options.step )
-                               options.step.apply( elem, [ z.now ] );
-
-                       if ( prop == "opacity" )
-                               jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
-                       else if ( parseInt(z.now) ) // My hate for IE will never die
-                               y[prop] = parseInt(z.now) + "px";
-               };
+});
 
-               // Figure out the maximum number to run to
-               z.max = function(){
-                       return parseFloat( jQuery.css(elem,prop) );
-               };
+jQuery.fx.prototype = {
 
-               // Get the current size
-               z.cur = function(){
-                       var r = parseFloat( jQuery.curCSS(elem, prop) );
-                       return r && r > -10000 ? r : z.max();
-               };
+       // Simple function for setting a style value
+       update: function(){
+               if ( this.options.step )
+                       this.options.step.apply( this.elem, [ this.now, this ] );
 
-               // Start an animation from one number to another
-               z.custom = function(from,to){
-                       z.startTime = (new Date()).getTime();
-                       z.now = from;
-                       z.a();
+               (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
 
-                       z.timer = setInterval(function(){
-                               z.step(from, to);
-                       }, 13);
-               };
+               // Set display property to block for height/width animations
+               if ( this.prop == "height" || this.prop == "width" )
+                       this.elem.style.display = "block";
+       },
+
+       // Get the current size
+       cur: function(force){
+               if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
+                       return this.elem[ this.prop ];
 
-               // Simple 'show' function
-               z.show = function(){
-                       if ( !elem.orig ) elem.orig = {};
+               var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+       },
 
-                       // Remember where we started, so that we can go back to it later
-                       elem.orig[prop] = this.cur();
+       // Start an animation from one number to another
+       custom: function(from, to, unit){
+               this.startTime = (new Date()).getTime();
+               this.start = from;
+               this.end = to;
+               this.unit = unit || this.unit || "px";
+               this.now = this.start;
+               this.pos = this.state = 0;
+               this.update();
+
+               var self = this;
+               function t(){
+                       return self.step();
+               }
 
-                       options.show = true;
+               t.elem = this.elem;
 
-                       // Begin the animation
-                       z.custom(0, elem.orig[prop]);
+               jQuery.timers.push(t);
 
-                       // Stupid IE, look what you made me do
-                       if ( prop != "opacity" )
-                               y[prop] = "1px";
-               };
+               if ( jQuery.timers.length == 1 ) {
+                       var timer = setInterval(function(){
+                               var timers = jQuery.timers;
+                               
+                               for ( var i = 0; i < timers.length; i++ )
+                                       if ( !timers[i]() )
+                                               timers.splice(i--, 1);
 
-               // Simple 'hide' function
-               z.hide = function(){
-                       if ( !elem.orig ) elem.orig = {};
+                               if ( !timers.length )
+                                       clearInterval( timer );
+                       }, 13);
+               }
+       },
 
-                       // Remember where we started, so that we can go back to it later
-                       elem.orig[prop] = this.cur();
+       // Simple 'show' function
+       show: function(){
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.show = true;
 
-                       options.hide = true;
+               // Begin the animation
+               this.custom(0, this.cur());
 
-                       // Begin the animation
-                       z.custom(elem.orig[prop], 0);
-               };
+               // Make sure that we start at a small width/height to avoid any
+               // flash of content
+               if ( this.prop == "width" || this.prop == "height" )
+                       this.elem.style[this.prop] = "1px";
                
-               //Simple 'toggle' function
-               z.toggle = function() {
-                       if ( !elem.orig ) elem.orig = {};
-
-                       // Remember where we started, so that we can go back to it later
-                       elem.orig[prop] = this.cur();
+               // Start by showing the element
+               jQuery(this.elem).show();
+       },
 
-                       if(oldDisplay == 'none')  {
-                               options.show = true;
-                               
-                               // Stupid IE, look what you made me do
-                               if ( prop != "opacity" )
-                                       y[prop] = "1px";
-
-                               // Begin the animation
-                               z.custom(0, elem.orig[prop]);   
-                       } else {
-                               options.hide = true;
-
-                               // Begin the animation
-                               z.custom(elem.orig[prop], 0);
-                       }               
-               };
+       // Simple 'hide' function
+       hide: function(){
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.hide = true;
 
-               // Each step of an animation
-               z.step = function(firstNum, lastNum){
-                       var t = (new Date()).getTime();
+               // Begin the animation
+               this.custom(this.cur(), 0);
+       },
 
-                       if (t > options.duration + z.startTime) {
-                               // Stop the timer
-                               clearInterval(z.timer);
-                               z.timer = null;
+       // Each step of an animation
+       step: function(){
+               var t = (new Date()).getTime();
 
-                               z.now = lastNum;
-                               z.a();
+               if ( t > this.options.duration + this.startTime ) {
+                       this.now = this.end;
+                       this.pos = this.state = 1;
+                       this.update();
 
-                               if (elem.curAnim) elem.curAnim[ prop ] = true;
+                       this.options.curAnim[ this.prop ] = true;
 
-                               var done = true;
-                               for ( var i in elem.curAnim )
-                                       if ( elem.curAnim[i] !== true )
-                                               done = false;
+                       var done = true;
+                       for ( var i in this.options.curAnim )
+                               if ( this.options.curAnim[i] !== true )
+                                       done = false;
 
-                               if ( done ) {
+                       if ( done ) {
+                               if ( this.options.display != null ) {
                                        // Reset the overflow
-                                       y.overflow = '';
-                                       
+                                       this.elem.style.overflow = this.options.overflow;
+                               
                                        // Reset the display
-                                       y.display = oldDisplay;
-                                       if (jQuery.css(elem, 'display') == 'none')
-                                               y.display = 'block';
-
-                                       // Hide the element if the "hide" operation was done
-                                       if ( options.hide ) 
-                                               y.display = 'none';
-
-                                       // Reset the properties, if the item has been hidden or shown
-                                       if ( options.hide || options.show )
-                                               for ( var p in elem.curAnim )
-                                                       if (p == "opacity")
-                                                               jQuery.attr(y, p, elem.orig[p]);
-                                                       else
-                                                               y[p] = '';
+                                       this.elem.style.display = this.options.display;
+                                       if ( jQuery.css(this.elem, "display") == "none" )
+                                               this.elem.style.display = "block";
                                }
 
-                               // If a callback was provided, execute it
-                               if ( done && options.complete && options.complete.constructor == Function )
-                                       // Execute the complete function
-                                       options.complete.apply( elem );
-                       } else {
-                               var n = t - this.startTime;
-                               // Figure out where in the animation we are and set the number
-                               var p = n / options.duration;
-                               
-                               // If the easing function exists, then use it 
-                               z.now = options.easing && jQuery.easing[options.easing] ?
-                                       jQuery.easing[options.easing](p, n,  firstNum, (lastNum-firstNum), options.duration) :
-                                       // else use default linear easing
-                                       ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
-
-                               // Perform the next step of the animation
-                               z.a();
+                               // Hide the element if the "hide" operation was done
+                               if ( this.options.hide )
+                                       this.elem.style.display = "none";
+
+                               // Reset the properties, if the item has been hidden or shown
+                               if ( this.options.hide || this.options.show )
+                                       for ( var p in this.options.curAnim )
+                                               jQuery.attr(this.elem.style, p, this.options.orig[p]);
                        }
-               };
-       
+
+                       // If a callback was provided, execute it
+                       if ( done && jQuery.isFunction( this.options.complete ) )
+                               // Execute the complete function
+                               this.options.complete.apply( this.elem );
+
+                       return false;
+               } else {
+                       var n = t - this.startTime;
+                       this.state = n / this.options.duration;
+
+                       // Perform the easing function, defaults to swing
+                       this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+                       this.now = this.start + ((this.end - this.start) * this.pos);
+
+                       // Perform the next step of the animation
+                       this.update();
+               }
+
+               return true;
        }
-});
+
+};
+
+jQuery.fx.step = {
+       scrollLeft: function(fx){
+               fx.elem.scrollLeft = fx.now;
+       },
+
+       scrollTop: function(fx){
+               fx.elem.scrollTop = fx.now;
+       },
+
+       opacity: function(fx){
+               jQuery.attr(fx.elem.style, "opacity", fx.now);
+       },
+
+       _default: function(fx){
+               fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+       }
+};