X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=6f7f9d1ea5a5f68296f270930f6e65ec72a2ca27;hb=d7b73ea5c7440c49c804b3cafe67e84aafbdd064;hp=64706685b19618b4fb79d7af490a91ab364107c1;hpb=1ffa984e0d27a832245920d045b88c94c00a998c;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 6470668..6f7f9d1 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -4,33 +4,25 @@ jQuery.fn.extend({
 	_show: jQuery.fn.show,
 	
 	/**
-	 * Show all matched elements using a graceful animation.
+	 * 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");
 	 *
-	 * @name show
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Show all matched elements using a graceful animation and firing a callback
-	 * function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name show
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see hide(String|Number,Function)
 	 */
 	show: function(speed,callback){
 		return speed ? this.animate({
@@ -42,33 +34,25 @@ jQuery.fn.extend({
 	_hide: jQuery.fn.hide,
 	
 	/**
-	 * Hide all matched elements using a graceful animation.
+	 * 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");
 	 *
-	 * @name hide
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Hide all matched elements using a graceful animation and firing a callback
-	 * function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name hide
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see show(String|Number,Function)
 	 */
 	hide: function(speed,callback){
 		return speed ? this.animate({
@@ -77,209 +61,163 @@ jQuery.fn.extend({
 	},
 	
 	/**
-	 * Reveal all matched elements by adjusting their height.
+	 * 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");
 	 *
-	 * @name slideDown
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Reveal all matched elements by adjusting their height and firing a callback
-	 * function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideDown
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @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.
+	 * 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");
 	 *
-	 * @name slideUp
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Hide all matched elements by adjusting their height and firing a callback
-	 * function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideUp
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @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.
+	 * 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");
 	 *
-	 * @name slideToggle
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Toggle the visibility of all matched elements by adjusting their height
-	 * and firing a callback function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideToggle
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see slideDown(String|Number,Function)
+	 * @see slideUp(String|Number,Function)
 	 */
-	slideToggle: function(speed,callback){
+	slideToggle: function(speed, callback){
 		return this.each(function(){
-			var state = $(this).is(":hidden") ? "show" : "hide";
-			$(this).animate({height: state}, speed, callback);
+			var state = jQuery(this).is(":hidden") ? "show" : "hide";
+			jQuery(this).animate({height: state}, speed, callback);
 		});
 	},
 	
 	/**
-	 * Fade in all matched elements by adjusting their opacity.
+	 * 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");
 	 *
-	 * @name fadeIn
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade in all matched elements by adjusting their opacity and firing a 
-	 * callback function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeIn
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see fadeOut(String|Number,Function)
+	 * @see fadeTo(String|Number,Number,Function)
 	 */
-	fadeIn: function(speed,callback){
+	fadeIn: function(speed, callback){
 		return this.animate({opacity: "show"}, speed, callback);
 	},
 	
 	/**
-	 * Fade out all matched elements by adjusting their opacity.
+	 * 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");
 	 *
-	 * @name fadeOut
-	 * @type jQuery
-	 * @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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade out all matched elements by adjusting their opacity and firing a 
-	 * callback function 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",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeOut
 	 * @type jQuery
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see fadeIn(String|Number,Function)
+	 * @see fadeTo(String|Number,Number,Function)
 	 */
-	fadeOut: function(speed,callback){
+	fadeOut: function(speed, callback){
 		return this.animate({opacity: "hide"}, speed, callback);
 	},
 	
 	/**
-	 * Fade the opacity of all matched elements to a specified opacity.
+	 * 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);
 	 *
-	 * @name fadeTo
-	 * @type jQuery
-	 * @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).
-	 * @param Number opacity The opacity to fade to (a number from 0 to 1).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade the opacity of all matched elements to a specified opacity and 
-	 * firing a callback function 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, function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeTo
 	 * @type jQuery
-	 * @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).
+	 * @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 A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @param Function callback (optional) A function to be executed whenever the animation completes.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
+	 * @see fadeIn(String|Number,Function)
+	 * @see fadeOut(String|Number,Function)
 	 */
 	fadeTo: function(speed,to,callback){
 		return this.animate({opacity: to}, speed, callback);
@@ -308,17 +246,19 @@ jQuery.fn.extend({
 	 * @name animate
 	 * @type jQuery
 	 * @param Hash params A set of style attributes that you wish to animate, and to what end.
-	 * @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).
-	 * @param Function callback A function to be executed whenever the animation completes.
-	 * @cat Effects/Animations
+	 * @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.
+	 * @param String easing (optional) easing effect
+	 * @cat Effects
 	 */
-	animate: function(prop,speed,callback) {
+	animate: function( prop, speed, easing, callback ) {
 		return this.queue(function(){
 		
-			this.curAnim = prop;
+			this.curAnim = jQuery.extend({}, prop);
+			var opt = jQuery.speed(speed, easing, callback);
 			
 			for ( var p in prop ) {
-				var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
+				var e = new jQuery.fx( this, opt, p );
 				if ( prop[p].constructor == Number )
 					e.custom( e.cur(), prop[p] );
 				else
@@ -355,54 +295,31 @@ jQuery.fn.extend({
 });
 
 jQuery.extend({
-
-	setAuto: function(e,p) {
-		if ( e.notAuto ) return;
-
-		if ( p == "height" && e.scrollHeight != parseInt(jQuery.curCSS(e,p)) ) return;
-		if ( p == "width" && e.scrollWidth != parseInt(jQuery.curCSS(e,p)) ) return;
-
-		// Remember the original height
-		var a = e.style[p];
-
-		// Figure out the size of the height right now
-		var o = jQuery.curCSS(e,p,1);
-
-		if ( p == "height" && e.scrollHeight != o ||
-			p == "width" && e.scrollWidth != o ) return;
-
-		// Set the height to auto
-		e.style[p] = e.currentStyle ? "" : "auto";
-
-		// See what the size of "auto" is
-		var n = jQuery.curCSS(e,p,1);
-
-		// Revert back to the original size
-		if ( o != n && n != "auto" ) {
-			e.style[p] = a;
-			e.notAuto = true;
-		}
-	},
 	
-	speed: function(s,o) {
-		o = o || {};
-		
-		if ( o.constructor == Function )
-			o = { complete: o };
-		
-		var ss = { slow: 600, fast: 200 };
-		o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;
+	speed: function(speed, easing, fn) {
+		var opt = speed.constructor == Object ? speed : {
+			complete: fn || !fn && easing || 
+				speed.constructor == Function && speed,
+			duration: speed,
+			easing: fn && easing || easing && easing.constructor != Function && easing
+		};
+
+		opt.duration = (opt.duration.constructor == Number ? 
+			opt.duration : 
+			{ slow: 600, fast: 200 }[opt.duration]) || 400;
 	
 		// Queueing
-		o.oldComplete = o.complete;
-		o.complete = function(){
+		opt.oldComplete = opt.complete;
+		opt.complete = function(){
 			jQuery.dequeue(this, "fx");
-			if ( o.oldComplete && o.oldComplete.constructor == Function )
-				o.oldComplete.apply( this );
+			if ( opt.oldComplete && opt.oldComplete.constructor == Function )
+				opt.oldComplete.apply( this );
 		};
 	
-		return o;
-	},
+		return opt;
+	},
+	
+	easing: {},
 	
 	queue: {},
 	
@@ -427,106 +344,111 @@ jQuery.extend({
 	 */
 	
 	fx: function( elem, options, prop ){
-	
+
 		var z = this;
-	
-		// The users options
-		z.o = {
-			duration: options.duration || 400,
-			complete: options.complete,
-			step: options.step
-		};
-	
-		// The element
-		z.el = elem;
-	
+
 		// The styles
-		var y = z.el.style;
-	
+		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" ) {
-				if (jQuery.browser.mozilla && z.now == 1) z.now = 0.9999;
-				if (window.ActiveXObject)
-					y.filter = "alpha(opacity=" + z.now*100 + ")";
-				else
-					y.opacity = z.now;
-
-			// My hate for IE will never die
-			} else if ( parseInt(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";
-				
-			y.display = "block";
 		};
-	
+
 		// Figure out the maximum number to run to
 		z.max = function(){
-			return parseFloat( jQuery.css(z.el,prop) );
+			return parseFloat( jQuery.css(elem,prop) );
 		};
-	
+
 		// Get the current size
 		z.cur = function(){
-			var r = parseFloat( jQuery.curCSS(z.el, prop) );
+			var r = parseFloat( jQuery.curCSS(elem, prop) );
 			return r && r > -10000 ? r : z.max();
 		};
-	
+
 		// Start an animation from one number to another
 		z.custom = function(from,to){
 			z.startTime = (new Date()).getTime();
 			z.now = from;
 			z.a();
-	
+
 			z.timer = setInterval(function(){
 				z.step(from, to);
 			}, 13);
 		};
-	
+
 		// Simple 'show' function
-		z.show = function( p ){
-			if ( !z.el.orig ) z.el.orig = {};
+		z.show = function(){
+			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			z.el.orig[prop] = this.cur();
+			elem.orig[prop] = this.cur();
 
-			z.custom( 0, z.el.orig[prop] );
+			options.show = true;
+
+			// Begin the animation
+			z.custom(0, elem.orig[prop]);
 
 			// Stupid IE, look what you made me do
 			if ( prop != "opacity" )
 				y[prop] = "1px";
 		};
-	
+
 		// Simple 'hide' function
 		z.hide = function(){
-			if ( !z.el.orig ) z.el.orig = {};
+			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			z.el.orig[prop] = this.cur();
+			elem.orig[prop] = this.cur();
 
-			z.o.hide = true;
+			options.hide = true;
 
 			// Begin the animation
-			z.custom(z.el.orig[prop], 0);
+			z.custom(elem.orig[prop], 0);
 		};
-	
-		// IE has trouble with opacity if it does not have layout
-		if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
-			y.zoom = "1";
-	
-		// Remember  the overflow of the element
-		if ( !z.el.oldOverlay )
-			z.el.oldOverflow = jQuery.css( z.el, "overflow" );
-	
-		// Make sure that nothing sneaks out
-		y.overflow = "hidden";
-	
+		
+		//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();
+
+			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);
+			}		
+		};
+
 		// Each step of an animation
 		z.step = function(firstNum, lastNum){
 			var t = (new Date()).getTime();
-	
-			if (t > z.o.duration + z.startTime) {
+
+			if (t > options.duration + z.startTime) {
 				// Stop the timer
 				clearInterval(z.timer);
 				z.timer = null;
@@ -534,47 +456,54 @@ jQuery.extend({
 				z.now = lastNum;
 				z.a();
 
-				z.el.curAnim[ prop ] = true;
-				
+				if (elem.curAnim) elem.curAnim[ prop ] = true;
+
 				var done = true;
-				for ( var i in z.el.curAnim )
-					if ( z.el.curAnim[i] !== true )
+				for ( var i in elem.curAnim )
+					if ( elem.curAnim[i] !== true )
 						done = false;
-						
+
 				if ( done ) {
 					// Reset the overflow
-					y.overflow = z.el.oldOverflow;
-				
+					y.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 ( z.o.hide ) 
+					if ( options.hide ) 
 						y.display = 'none';
-					
-					// Reset the property, if the item has been hidden
-					if ( z.o.hide ) {
-						for ( var p in z.el.curAnim ) {
-							y[ p ] = z.el.orig[p] + ( p == "opacity" ? "" : "px" );
-	
-							// set its height and/or width to auto
-							if ( p == 'height' || p == 'width' )
-								jQuery.setAuto( z.el, p );
-						}
-					}
+
+					// 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] = '';
 				}
 
 				// If a callback was provided, execute it
-				if( done && z.o.complete && z.o.complete.constructor == Function )
+				if ( done && options.complete && options.complete.constructor == Function )
 					// Execute the complete function
-					z.o.complete.apply( z.el );
+					options.complete.apply( elem );
 			} else {
+				var n = t - this.startTime;
 				// Figure out where in the animation we are and set the number
-				var p = (t - this.startTime) / z.o.duration;
-				z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
-	
+				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();
 			}
 		};
 	
 	}
-
-});
+});
\ No newline at end of file