aboutsummaryrefslogtreecommitdiffstats
path: root/src/effects.js
diff options
context:
space:
mode:
authorKarl Swedberg <kswedberg@gmail.com>2010-09-08 16:31:32 -0400
committerjeresig <jeresig@gmail.com>2010-09-22 11:30:54 -0400
commit1f667aa035b3e4885d6b35fa9aa4990310f131af (patch)
treec9b44600ba404c0759010f7e63ee21b3e5d48881 /src/effects.js
parent06883449d6ac16c2f9ed631da15d88929dd7f817 (diff)
downloadjquery-1f667aa035b3e4885d6b35fa9aa4990310f131af.tar.gz
jquery-1f667aa035b3e4885d6b35fa9aa4990310f131af.zip
Added full support for easing in all shorthand effects methods (hide, show, toggle, fadeTo, slideUp, etc.). Previously, these methods could only be used with two of the three (speed, easing, callback) arguments, or, in the case of fadeTo, 3 of the 4 (speed, opacity, easing, callback) arguments. Added three more sets of tests to the series of "Chain" tests. Fixes #7014
Diffstat (limited to 'src/effects.js')
-rw-r--r--src/effects.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/effects.js b/src/effects.js
index 87d0f4db7..96441948b 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -14,9 +14,9 @@ var elemdisplay = {},
];
jQuery.fn.extend({
- show: function( speed, callback ) {
+ show: function( speed, easing, callback ) {
if ( speed || speed === 0) {
- return this.animate( genFx("show", 3), speed, callback);
+ return this.animate( genFx("show", 3), speed, easing, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -58,9 +58,9 @@ jQuery.fn.extend({
}
},
- hide: function( speed, callback ) {
+ hide: function( speed, easing, callback ) {
if ( speed || speed === 0 ) {
- return this.animate( genFx("hide", 3), speed, callback);
+ return this.animate( genFx("hide", 3), speed, easing, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -83,7 +83,7 @@ jQuery.fn.extend({
// Save the old toggle function
_toggle: jQuery.fn.toggle,
- toggle: function( fn, fn2 ) {
+ toggle: function( fn, fn2, callback ) {
var bool = typeof fn === "boolean";
if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
@@ -96,15 +96,15 @@ jQuery.fn.extend({
});
} else {
- this.animate(genFx("toggle", 3), fn, fn2);
+ this.animate(genFx("toggle", 3), fn, fn2, callback);
}
return this;
},
- fadeTo: function( speed, to, callback ) {
+ fadeTo: function( speed, to, easing, callback ) {
return this.filter(":hidden").css("opacity", 0).show().end()
- .animate({opacity: to}, speed, callback);
+ .animate({opacity: to}, speed, easing, callback);
},
animate: function( prop, speed, easing, callback ) {
@@ -241,8 +241,8 @@ jQuery.each({
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
}, function( name, props ) {
- jQuery.fn[ name ] = function( speed, callback ) {
- return this.animate( props, speed, callback );
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return this.animate( props, speed, easing, callback );
};
});