github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-06 06:15:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Karl Swedberg
2010-09-08 16:31:32 -04:00
committed by jeresig
parent 06883449d6
commit 1f667aa035
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/effects.js vendored
View File

@@ -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 );
};
});