}
},
+ timers: [],
+
/*
* 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
// The styles
var y = elem.style;
- // Store display property
- var oldDisplay = jQuery.css(elem, "display");
+ if ( prop == "height" || prop == "width" ) {
+ // Store display property
+ var oldDisplay = jQuery.css(elem, "display");
- // Make sure that nothing sneaks out
- y.overflow = "hidden";
+ // Make sure that nothing sneaks out
+ var oldOverflow = y.overflow;
+ y.overflow = "hidden";
+ }
// Simple function for setting a style value
z.a = function(){
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
+ else {
y[prop] = parseInt(z.now) + "px";
-
- y.display = "block"; // Set display property to block for animation
+ y.display = "block"; // Set display property to block for animation
+ }
};
// Figure out the maximum number to run to
z.now = from;
z.a();
- z.timer = setInterval(function(){
- z.step(from, to);
- }, 13);
+ jQuery.timers.push(function(){
+ return z.step(from, to);
+ });
+
+ if ( jQuery.timers.length == 1 ) {
+ var timer = setInterval(function(){
+ jQuery.timers = jQuery.grep( jQuery.timers, function(fn){
+ return fn();
+ });
+
+ if ( !jQuery.timers.length )
+ clearInterval( timer );
+ }, 13);
+ }
};
// Simple 'show' function
if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- elem.orig[prop] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.show = true;
// Begin the animation
- z.custom(0, elem.orig[prop]);
+ z.custom(0, this.cur());
// Stupid IE, look what you made me do
if ( prop != "opacity" )
if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- elem.orig[prop] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.hide = true;
// Begin the animation
- z.custom(elem.orig[prop], 0);
+ z.custom(this.cur(), 0);
};
//Simple '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();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
if(oldDisplay == "none") {
options.show = true;
y[prop] = "1px";
// Begin the animation
- z.custom(0, elem.orig[prop]);
+ z.custom(0, this.cur());
} else {
options.hide = true;
// Begin the animation
- z.custom(elem.orig[prop], 0);
+ z.custom(this.cur(), 0);
}
};
var t = (new Date()).getTime();
if (t > options.duration + z.startTime) {
- // Stop the timer
- clearInterval(z.timer);
- z.timer = null;
-
z.now = lastNum;
z.a();
done = false;
if ( done ) {
- // Reset the overflow
- y.overflow = "";
+ if ( oldDisplay ) {
+ // Reset the overflow
+ y.overflow = oldOverflow;
- // Reset the display
- y.display = oldDisplay;
- if (jQuery.css(elem, "display") == "none")
- y.display = "block";
+ // 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 )
// 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] = "";
+ jQuery.attr(y, p, elem.orig[p]);
}
// If a callback was provided, execute it
if ( done && jQuery.isFunction( options.complete ) )
// Execute the complete function
options.complete.apply( elem );
+
+ return false;
} else {
var n = t - this.startTime;
// Figure out where in the animation we are and set the number
// Perform the next step of the animation
z.a();
}
+
+ return true;
};
}