X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=0c57ef450792c26d6ec3a6eaade8108bdc41ed0d;hb=1b9f4d3d2e1bc2dfd7572da77159fa01f9ab5d6e;hp=f20cc468fb649841119eaa397ab91d34fa07b305;hpb=397be502f92abf14e97c247763d41d690561907a;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index f20cc46..0c57ef4 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -143,7 +143,7 @@ jQuery.fn.extend({ * @see slideToggle(String|Number,Function) */ slideDown: function(speed,callback){ - return this.animate({height: "show"}, speed, callback); + return this.filter(":hidden").animate({height: "show"}, speed, callback).end(); }, /** @@ -168,7 +168,7 @@ jQuery.fn.extend({ * @see slideToggle(String|Number,Function) */ slideUp: function(speed,callback){ - return this.animate({height: "hide"}, speed, callback); + return this.filter(":visible").animate({height: "hide"}, speed, callback).end(); }, /** @@ -222,7 +222,7 @@ jQuery.fn.extend({ * @see fadeTo(String|Number,Number,Function) */ fadeIn: function(speed, callback){ - return this.animate({opacity: "show"}, speed, callback); + return this.filter(":hidden").animate({opacity: "show"}, speed, callback).end(); }, /** @@ -248,7 +248,7 @@ jQuery.fn.extend({ * @see fadeTo(String|Number,Number,Function) */ fadeOut: function(speed, callback){ - return this.animate({opacity: "hide"}, speed, callback); + return this.filter(":visible").animate({opacity: "hide"}, speed, callback).end(); }, /** @@ -279,15 +279,18 @@ jQuery.fn.extend({ }, /** - * A function for making your own, custom, animations. The key aspect of + * 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"). * + * Note that properties should be specified using camel case + * eg. marginLeft instead of margin-left. + * * 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 + * Otherwise if the string "hide", "show", or "toggle" is provided, a default * animation will be constructed for that property. * * @example $("p").animate({ @@ -307,7 +310,7 @@ jQuery.fn.extend({ * @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 String easing (optional) The name of the easing effect that you want to use (e.g. swing or linear). Defaults to "swing". * @param Function callback (optional) A function to be executed whenever the animation completes. * @cat Effects */ @@ -361,7 +364,7 @@ jQuery.extend({ complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, - easing: fn && easing || easing && easing.constructor != Function && easing + easing: fn && easing || easing && easing.constructor != Function && easing || "swing" }; opt.duration = (opt.duration && opt.duration.constructor == Number ? @@ -379,7 +382,14 @@ jQuery.extend({ return opt; }, - easing: {}, + 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; + } + }, queue: {}, @@ -397,6 +407,8 @@ jQuery.extend({ } }, + 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 @@ -410,11 +422,14 @@ jQuery.extend({ // 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(){ @@ -423,10 +438,10 @@ jQuery.extend({ 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 @@ -446,9 +461,20 @@ jQuery.extend({ 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 @@ -456,12 +482,12 @@ jQuery.extend({ 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" ) @@ -473,12 +499,12 @@ jQuery.extend({ 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 @@ -486,7 +512,7 @@ jQuery.extend({ 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; @@ -496,12 +522,12 @@ jQuery.extend({ 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); } }; @@ -510,10 +536,6 @@ jQuery.extend({ 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(); @@ -525,13 +547,15 @@ jQuery.extend({ 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 ) @@ -540,30 +564,28 @@ jQuery.extend({ // 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 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 easing function, defaults to swing + z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration); // Perform the next step of the animation z.a(); } + + return true; }; }