Massive FX rewrite. Full list of changes:
[jquery.git] / src / fx / fx.js
index e6b5996..9fde6b9 100644 (file)
-jQuery.fn.extend({\r
-\r
-       // overwrite the old show method\r
-       _show: jQuery.fn.show,\r
-       \r
-       /**\r
-        * Show all matched elements using a graceful animation and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * The height, width, and opacity of each of the matched elements \r
-        * are changed dynamically according to the specified speed.\r
-        *\r
-        * @example $("p").show("slow");\r
-        *\r
-        * @example $("p").show("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name show\r
-        * @type jQuery\r
-        * @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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        * @see hide(String|Number,Function)\r
-        */\r
-       show: function(speed,callback){\r
-               return speed ? this.animate({\r
-                       height: "show", width: "show", opacity: "show"\r
-               }, speed, callback) : this._show();\r
-       },\r
-       \r
-       // Overwrite the old hide method\r
-       _hide: jQuery.fn.hide,\r
-       \r
-       /**\r
-        * Hide all matched elements using a graceful animation and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * The height, width, and opacity of each of the matched elements \r
-        * are changed dynamically according to the specified speed.\r
-        *\r
-        * @example $("p").hide("slow");\r
-        *\r
-        * @example $("p").hide("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name hide\r
-        * @type jQuery\r
-        * @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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        * @see show(String|Number,Function)\r
-        */\r
-       hide: function(speed,callback){\r
-               return speed ? this.animate({\r
-                       height: "hide", width: "hide", opacity: "hide"\r
-               }, speed, callback) : this._hide();\r
-       },\r
-       \r
-       /**\r
-        * Reveal all matched elements by adjusting their height and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the height is adjusted for this animation, causing all matched\r
-        * elements to be revealed in a "sliding" manner.\r
-        *\r
-        * @example $("p").slideDown("slow");\r
-        *\r
-        * @example $("p").slideDown("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name slideDown\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       slideDown: function(speed,callback){\r
-               return this.animate({height: "show"}, speed, callback);\r
-       },\r
-       \r
-       /**\r
-        * Hide all matched elements by adjusting their height and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the height is adjusted for this animation, causing all matched\r
-        * elements to be hidden in a "sliding" manner.\r
-        *\r
-        * @example $("p").slideUp("slow");\r
-        *\r
-        * @example $("p").slideUp("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name slideUp\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       slideUp: function(speed,callback){\r
-               return this.animate({height: "hide"}, speed, callback);\r
-       },\r
-\r
-       /**\r
-        * Toggle the visibility of all matched elements by adjusting their height and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the height is adjusted for this animation, causing all matched\r
-        * elements to be hidden in a "sliding" manner.\r
-        *\r
-        * @example $("p").slideToggle("slow");\r
-        *\r
-        * @example $("p").slideToggle("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name slideToggle\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       slideToggle: function(speed,callback){\r
-               return this.each(function(){\r
-                       var state = jQuery(this).is(":hidden") ? "show" : "hide";\r
-                       jQuery(this).animate({height: state}, speed, callback);\r
-               });\r
-       },\r
-       \r
-       /**\r
-        * Fade in all matched elements by adjusting their opacity and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the opacity is adjusted for this animation, meaning that\r
-        * all of the matched elements should already have some form of height\r
-        * and width associated with them.\r
-        *\r
-        * @example $("p").fadeIn("slow");\r
-        *\r
-        * @example $("p").fadeIn("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name fadeIn\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       fadeIn: function(speed,callback){\r
-               return this.animate({opacity: "show"}, speed, callback);\r
-       },\r
-       \r
-       /**\r
-        * Fade out all matched elements by adjusting their opacity and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the opacity is adjusted for this animation, meaning that\r
-        * all of the matched elements should already have some form of height\r
-        * and width associated with them.\r
-        *\r
-        * @example $("p").fadeOut("slow");\r
-        *\r
-        * @example $("p").fadeOut("slow",function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name fadeOut\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       fadeOut: function(speed,callback){\r
-               return this.animate({opacity: "hide"}, speed, callback);\r
-       },\r
-       \r
-       /**\r
-        * Fade the opacity of all matched elements to a specified opacity and firing an\r
-        * optional callback after completion.\r
-        *\r
-        * Only the opacity is adjusted for this animation, meaning that\r
-        * all of the matched elements should already have some form of height\r
-        * and width associated with them.\r
-        *\r
-        * @example $("p").fadeTo("slow", 0.5);\r
-        *\r
-        * @example $("p").fadeTo("slow", 0.5, function(){\r
-        *   alert("Animation Done.");\r
-        * });\r
-        *\r
-        * @name fadeTo\r
-        * @type jQuery\r
-        * @param Object 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).\r
-        * @param Number opacity The opacity to fade to (a number from 0 to 1).\r
-        * @param Function callback (optional) A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       fadeTo: function(speed,to,callback){\r
-               return this.animate({opacity: to}, speed, callback);\r
-       },\r
-       \r
-       /**\r
-        * A function for making your own, custom, animations. The key aspect of\r
-        * this function is the object of style properties that will be animated,\r
-        * and to what end. Each key within the object represents a style property\r
-        * that will also be animated (for example: "height", "top", or "opacity").\r
-        *\r
-        * The value associated with the key represents to what end the property\r
-        * will be animated. If a number is provided as the value, then the style\r
-        * property will be transitioned from its current state to that new number.\r
-        * Oterwise if the string "hide", "show", or "toggle" is provided, a default\r
-        * animation will be constructed for that property.\r
-        *\r
-        * @example $("p").animate({\r
-        *   height: 'toggle', opacity: 'toggle'\r
-        * }, "slow");\r
-        *\r
-        * @example $("p").animate({\r
-        *   left: 50, opacity: 'show'\r
-        * }, 500);\r
-        *\r
-        * @name animate\r
-        * @type jQuery\r
-        * @param Hash params A set of style attributes that you wish to animate, and to what end.\r
-        * @param Object 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).\r
-        * @param Function callback A function to be executed whenever the animation completes.\r
-        * @cat Effects/Animations\r
-        */\r
-       animate: function(prop,speed,callback) {\r
-               return this.queue(function(){\r
-               \r
-                       this.curAnim = jQuery.extend({}, prop);\r
-                       \r
-                       for ( var p in prop ) {\r
-                               var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );\r
-                               if ( prop[p].constructor == Number )\r
-                                       e.custom( e.cur(), prop[p] );\r
-                               else\r
-                                       e[ prop[p] ]( prop );\r
-                       }\r
-                       \r
-               });\r
-       },\r
-       \r
-       /**\r
-        *\r
-        * @private\r
-        */\r
-       queue: function(type,fn){\r
-               if ( !fn ) {\r
-                       fn = type;\r
-                       type = "fx";\r
-               }\r
-       \r
-               return this.each(function(){\r
-                       if ( !this.queue )\r
-                               this.queue = {};\r
-       \r
-                       if ( !this.queue[type] )\r
-                               this.queue[type] = [];\r
-       \r
-                       this.queue[type].push( fn );\r
-               \r
-                       if ( this.queue[type].length == 1 )\r
-                               fn.apply(this);\r
-               });\r
-       }\r
-\r
-});\r
-\r
-jQuery.extend({\r
-       \r
-       speed: function(s,o) {\r
-               o = o || {};\r
-               \r
-               if ( o.constructor == Function )\r
-                       o = { complete: o };\r
-               \r
-               var ss = { slow: 600, fast: 200 };\r
-               o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;\r
-       \r
-               // Queueing\r
-               o.oldComplete = o.complete;\r
-               o.complete = function(){\r
-                       jQuery.dequeue(this, "fx");\r
-                       if ( o.oldComplete && o.oldComplete.constructor == Function )\r
-                               o.oldComplete.apply( this );\r
-               };\r
-       \r
-               return o;\r
-       },\r
-       \r
-       queue: {},\r
-       \r
-       dequeue: function(elem,type){\r
-               type = type || "fx";\r
-       \r
-               if ( elem.queue && elem.queue[type] ) {\r
-                       // Remove self\r
-                       elem.queue[type].shift();\r
-       \r
-                       // Get next function\r
-                       var f = elem.queue[type][0];\r
-               \r
-                       if ( f ) f.apply( elem );\r
-               }\r
-       },\r
-\r
-       /*\r
-        * I originally wrote fx() as a clone of moo.fx and in the process\r
-        * of making it small in size the code became illegible to sane\r
-        * people. You've been warned.\r
-        */\r
-       \r
-       fx: function( elem, options, prop ){\r
-\r
-               var z = this;\r
-\r
-               // The users options\r
-               z.o = {\r
-                       duration: options.duration || 400,\r
-                       complete: options.complete,\r
-                       step: options.step\r
-               };\r
-\r
-               // The element\r
-               z.el = elem;\r
-\r
-               // The styles\r
-               var y = z.el.style;\r
-               \r
-               // Store display property\r
-               var oldDisplay = jQuery.css(z.el, 'display');\r
-               // Set display property to block for animation\r
-               y.display = "block";\r
-               // Make sure that nothing sneaks out\r
-               y.overflow = "hidden";\r
-\r
-               // Simple function for setting a style value\r
-               z.a = function(){\r
-                       if ( options.step )\r
-                               options.step.apply( elem, [ z.now ] );\r
-\r
-                       if ( prop == "opacity" )\r
-                               jQuery.attr(y, "opacity", z.now); // Let attr handle opacity\r
-                       else if ( parseInt(z.now) ) // My hate for IE will never die\r
-                               y[prop] = parseInt(z.now) + "px";\r
-               };\r
-\r
-               // Figure out the maximum number to run to\r
-               z.max = function(){\r
-                       return parseFloat( jQuery.css(z.el,prop) );\r
-               };\r
-\r
-               // Get the current size\r
-               z.cur = function(){\r
-                       var r = parseFloat( jQuery.curCSS(z.el, prop) );\r
-                       return r && r > -10000 ? r : z.max();\r
-               };\r
-\r
-               // Start an animation from one number to another\r
-               z.custom = function(from,to){\r
-                       z.startTime = (new Date()).getTime();\r
-                       z.now = from;\r
-                       z.a();\r
-\r
-                       z.timer = setInterval(function(){\r
-                               z.step(from, to);\r
-                       }, 13);\r
-               };\r
-\r
-               // Simple 'show' function\r
-               z.show = function(){\r
-                       if ( !z.el.orig ) z.el.orig = {};\r
-\r
-                       // Remember where we started, so that we can go back to it later\r
-                       z.el.orig[prop] = this.cur();\r
-\r
-                       z.o.show = true;\r
-\r
-                       // Begin the animation\r
-                       z.custom(0, z.el.orig[prop]);\r
-\r
-                       // Stupid IE, look what you made me do\r
-                       if ( prop != "opacity" )\r
-                               y[prop] = "1px";\r
-               };\r
-\r
-               // Simple 'hide' function\r
-               z.hide = function(){\r
-                       if ( !z.el.orig ) z.el.orig = {};\r
-\r
-                       // Remember where we started, so that we can go back to it later\r
-                       z.el.orig[prop] = this.cur();\r
-\r
-                       z.o.hide = true;\r
-\r
-                       // Begin the animation\r
-                       z.custom(z.el.orig[prop], 0);\r
-               };\r
-               \r
-               //Simple 'toggle' function\r
-               z.toggle = function() {\r
-                       if ( !z.el.orig ) z.el.orig = {};\r
-\r
-                       // Remember where we started, so that we can go back to it later\r
-                       z.el.orig[prop] = this.cur();\r
-\r
-                       if(oldDisplay == 'none')  {\r
-                               z.o.show = true;\r
-                               \r
-                               // Stupid IE, look what you made me do\r
-                               if ( prop != "opacity" )\r
-                                       y[prop] = "1px";\r
-\r
-                               // Begin the animation\r
-                               z.custom(0, z.el.orig[prop]);   \r
-                       } else {\r
-                               z.o.hide = true;\r
-\r
-                               // Begin the animation\r
-                               z.custom(z.el.orig[prop], 0);\r
-                       }               \r
-               };\r
-\r
-               // Each step of an animation\r
-               z.step = function(firstNum, lastNum){\r
-                       var t = (new Date()).getTime();\r
-\r
-                       if (t > z.o.duration + z.startTime) {\r
-                               // Stop the timer\r
-                               clearInterval(z.timer);\r
-                               z.timer = null;\r
-\r
-                               z.now = lastNum;\r
-                               z.a();\r
-\r
-                               if (z.el.curAnim) z.el.curAnim[ prop ] = true;\r
-\r
-                               var done = true;\r
-                               for ( var i in z.el.curAnim )\r
-                                       if ( z.el.curAnim[i] !== true )\r
-                                               done = false;\r
-\r
-                               if ( done ) {\r
-                                       // Reset the overflow\r
-                                       y.overflow = '';\r
-                                       \r
-                                       // Reset the display\r
-                                       y.display = oldDisplay;\r
-                                       if (jQuery.css(z.el, 'display') == 'none')\r
-                                               y.display = 'block';\r
-\r
-                                       // Hide the element if the "hide" operation was done\r
-                                       if ( z.o.hide ) \r
-                                               y.display = 'none';\r
-\r
-                                       // Reset the properties, if the item has been hidden or shown\r
-                                       if ( z.o.hide || z.o.show )\r
-                                               for ( var p in z.el.curAnim )\r
-                                                       if (p == "opacity")\r
-                                                               jQuery.attr(y, p, z.el.orig[p]);\r
-                                                       else\r
-                                                               y[p] = '';\r
-                               }\r
-\r
-                               // If a callback was provided, execute it\r
-                               if( done && z.o.complete && z.o.complete.constructor == Function )\r
-                                       // Execute the complete function\r
-                                       z.o.complete.apply( z.el );\r
-                       } else {\r
-                               // Figure out where in the animation we are and set the number\r
-                               var p = (t - this.startTime) / z.o.duration;\r
-                               z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;\r
-\r
-                               // Perform the next step of the animation\r
-                               z.a();\r
-                       }\r
-               };\r
-       \r
-       }\r
-\r
-});\r
+jQuery.fn.extend({
+       show: function(speed,callback){
+               return speed ?
+                       this.animate({
+                               height: "show", width: "show", opacity: "show"
+                       }, speed, callback) :
+                       
+                       this.filter(":hidden").each(function(){
+                               this.style.display = this.oldblock ? this.oldblock : "";
+                               if ( jQuery.css(this,"display") == "none" )
+                                       this.style.display = "block";
+                       }).end();
+       },
+       
+       hide: function(speed,callback){
+               return speed ?
+                       this.animate({
+                               height: "hide", width: "hide", opacity: "hide"
+                       }, speed, callback) :
+                       
+                       this.filter(":visible").each(function(){
+                               this.oldblock = this.oldblock || jQuery.css(this,"display");
+                               if ( this.oldblock == "none" )
+                                       this.oldblock = "block";
+                               this.style.display = "none";
+                       }).end();
+       },
+
+       // Save the old toggle function
+       _toggle: jQuery.fn.toggle,
+       
+       toggle: function( fn, fn2 ){
+               return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+                       this._toggle( fn, fn2 ) :
+                       fn ?
+                               this.animate({
+                                       height: "toggle", width: "toggle", opacity: "toggle"
+                               }, fn, fn2) :
+                               this.each(function(){
+                                       jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+                               });
+       },
+       
+       slideDown: function(speed,callback){
+               return this.animate({height: "show"}, speed, callback);
+       },
+       
+       slideUp: function(speed,callback){
+               return this.animate({height: "hide"}, speed, callback);
+       },
+
+       slideToggle: function(speed, callback){
+               return this.animate({height: "toggle"}, speed, callback);
+       },
+       
+       fadeIn: function(speed, callback){
+               return this.animate({opacity: "show"}, speed, callback);
+       },
+       
+       fadeOut: function(speed, callback){
+               return this.animate({opacity: "hide"}, speed, callback);
+       },
+       
+       fadeTo: function(speed,to,callback){
+               return this.animate({opacity: to}, speed, callback);
+       },
+       
+       animate: function( prop, 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 ) {
+                               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;
+               });
+       },
+       
+       queue: function(type, fn){
+               if ( !fn ) {
+                       fn = type;
+                       type = "fx";
+               }
+
+               if ( !arguments.length )
+                       return queue( this[0], type );
+
+               return this.each(function(){
+                       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 || 
+                               jQuery.isFunction( speed ) && speed,
+                       duration: speed,
+                       easing: fn && easing || easing && easing.constructor != Function && easing
+               };
+
+               opt.duration = (opt.duration && opt.duration.constructor == Number ? 
+                       opt.duration : 
+                       { slow: 600, fast: 200 }[opt.duration]) || 400;
+       
+               // Queueing
+               opt.old = opt.complete;
+               opt.complete = function(){
+                       jQuery(this).dequeue();
+                       if ( jQuery.isFunction( opt.old ) )
+                               opt.old.apply( this );
+               };
+       
+               return opt;
+       },
+       
+       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;
+               }
+       },
+       
+       timers: [],
+
+       fx: function( elem, options, prop ){
+               this.options = options;
+               this.elem = elem;
+               this.prop = prop;
+
+               if ( !options.orig )
+                       options.orig = {};
+       }
+
+});
+
+jQuery.fx.prototype = {
+
+       // Simple function for setting a style value
+       update: function(){
+               if ( this.options.step )
+                       this.options.step.apply( this.elem, [ this.now, this ] );
+
+               (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+               // 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 ];
+
+               var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+       },
+
+       // 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();
+               }
+
+               t.elem = this.elem;
+
+               jQuery.timers.push(t);
+
+               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);
+
+                               if ( !timers.length )
+                                       clearInterval( timer );
+                       }, 13);
+               }
+       },
+
+       // 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;
+
+               // Begin the animation
+               this.custom(0, this.cur());
+
+               // 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";
+               
+               // Start by showing the element
+               jQuery(this.elem).show();
+       },
+
+       // 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;
+
+               // Begin the animation
+               this.custom(this.cur(), 0);
+       },
+
+       // Each step of an animation
+       step: function(){
+               var t = (new Date()).getTime();
+
+               if ( t > this.options.duration + this.startTime ) {
+                       this.now = this.end;
+                       this.pos = this.state = 1;
+                       this.update();
+
+                       this.options.curAnim[ this.prop ] = true;
+
+                       var done = true;
+                       for ( var i in this.options.curAnim )
+                               if ( this.options.curAnim[i] !== true )
+                                       done = false;
+
+                       if ( done ) {
+                               if ( this.options.display != null ) {
+                                       // Reset the overflow
+                                       this.elem.style.overflow = this.options.overflow;
+                               
+                                       // Reset the display
+                                       this.elem.style.display = this.options.display;
+                                       if ( jQuery.css(this.elem, "display") == "none" )
+                                               this.elem.style.display = "block";
+                               }
+
+                               // 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;
+       }
+};