X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=f0b9c8e63662e19f1d0f21f5888e64cd11dcf15f;hb=645570310bc60b5bcee1aca4b05606503ad49c95;hp=308567c23f6d839a29f5e9faacdd5e98447d8e75;hpb=b1e1d5d0c7c7eecee6e79f4530f4a7910641fd1c;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index 308567c..f0b9c8e 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -4,285 +4,223 @@ 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. + * @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/Animations + * @see hide(String|Number,Function) */ - show: function(speed,callback){ + show: function(speed,callback, easing){ return speed ? this.animate({ height: "show", width: "show", opacity: "show" - }, speed, callback) : this._show(); + }, speed, callback, easing) : this._show(); }, // Overwrite the old hide method _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. + * @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/Animations + * @see show(String|Number,Function) */ - hide: function(speed,callback){ + hide: function(speed,callback, easing){ return speed ? this.animate({ height: "hide", width: "hide", opacity: "hide" - }, speed, callback) : this._hide(); + }, speed, callback, easing) : this._hide(); }, /** - * 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. + * @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/Animations + * @see slideUp(String|Number,Function) + * @see slideToggle(String|Number,Function) */ - slideDown: function(speed,callback){ - return this.animate({height: "show"}, speed, callback); + slideDown: function(speed,callback, easing){ + return this.animate({height: "show"}, speed, callback, easing); }, /** - * 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. + * @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/Animations + * @see slideDown(String|Number,Function) + * @see slideToggle(String|Number,Function) */ - slideUp: function(speed,callback){ - return this.animate({height: "hide"}, speed, callback); + slideUp: function(speed,callback, easing){ + return this.animate({height: "hide"}, speed, callback, easing); }, /** - * 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. + * @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/Animations + * @see slideDown(String|Number,Function) + * @see slideUp(String|Number,Function) */ - slideToggle: function(speed,callback){ + slideToggle: function(speed, callback, easing){ return this.each(function(){ var state = jQuery(this).is(":hidden") ? "show" : "hide"; - jQuery(this).animate({height: state}, speed, callback); + jQuery(this).animate({height: state}, speed, callback, easing); }); }, /** - * 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. + * @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/Animations + * @see fadeOut(String|Number,Function) + * @see fadeTo(String|Number,Number,Function) */ - fadeIn: function(speed,callback){ - return this.animate({opacity: "show"}, speed, callback); + fadeIn: function(speed, callback, easing){ + return this.animate({opacity: "show"}, speed, callback, easing); }, /** - * 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. + * @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/Animations + * @see fadeIn(String|Number,Function) + * @see fadeTo(String|Number,Number,Function) */ - fadeOut: function(speed,callback){ - return this.animate({opacity: "hide"}, speed, callback); + fadeOut: function(speed, callback, easing){ + return this.animate({opacity: "hide"}, speed, callback, easing); }, /** - * 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. + * @param Function callback (optional) A function to be executed whenever the animation completes. + * @param String easing (optional) easing effect * @cat Effects/Animations + * @see fadeIn(String|Number,Function) + * @see fadeOut(String|Number,Function) */ - fadeTo: function(speed,to,callback){ - return this.animate({opacity: to}, speed, callback); + fadeTo: function(speed,to,callback, easing){ + return this.animate({opacity: to}, speed, callback, easing); }, /** @@ -308,17 +246,18 @@ 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. + * @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/Animations */ - animate: function(prop,speed,callback) { + animate: function(prop,speed,callback, easing) { return this.queue(function(){ this.curAnim = jQuery.extend({}, prop); for ( var p in prop ) { - var e = new jQuery.fx( this, jQuery.speed(speed,callback), p ); + var e = new jQuery.fx( this, jQuery.speed(speed,callback), p, easing ); if ( prop[p].constructor == Number ) e.custom( e.cur(), prop[p] ); else @@ -398,7 +337,7 @@ jQuery.extend({ * people. You've been warned. */ - fx: function( elem, options, prop ){ + fx: function( elem, options, prop, easing ){ var z = this; @@ -406,9 +345,10 @@ jQuery.extend({ z.o = { duration: options.duration || 400, complete: options.complete, - step: options.step + step: options.step, + easing : easing || 'linear' }; - + // The element z.el = elem; @@ -555,9 +495,14 @@ jQuery.extend({ // Execute the complete function z.o.complete.apply( z.el ); } 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 / z.o.duration; + //if the easing function exists then use it else use default linear easing + if (jQuery.easing && jQuery.easing[z.o.easing]) + z.now = jQuery.easing[z.o.easing](p, n, firstNum, (lastNum-firstNum), z.o.duration); + else + z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum; // Perform the next step of the animation z.a(); @@ -565,5 +510,4 @@ jQuery.extend({ }; } - -}); +}); \ No newline at end of file