deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set val before hide/show check and fix easing setting; also update attributes test for autofocus

Browse source 
- The object passed should not change so it can be used in future animates, updated src and tests accordingly.
This commit is contained in:
timmywil 2011-05-07 20:46:38 -04:00
parent 3d1c27d52e
commit 8bb6e95b66
3 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/effects.js vendored
View file

@ -134,7 +134,7 @@ jQuery.fn.extend({
jQuery._mark( this );
}
var opt = jQuery.extend({}, optall),
var opt = jQuery.extend( {}, optall ),
isElement = this.nodeType === 1,
hidden = isElement && jQuery(this).is(":hidden"),
name, val, p,
@ -153,10 +153,18 @@ jQuery.fn.extend({
delete prop[ p ];
}
val = prop[name];
val = prop[ name ];
// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
if ( jQuery.isArray( val ) ) {
opt.animatedProperties[ name ] = val[ 1 ];
val = val[ 0 ];
} else {
opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
}
if ( val === "hide" && hidden || val === "show" && !hidden ) {
return opt.complete.call(this);
return opt.complete.call( this );
}
if ( isElement && ( name === "height" || name === "width" ) ) {
@ -175,7 +183,7 @@ jQuery.fn.extend({
this.style.display = "inline-block";
} else {
display = defaultDisplay(this.nodeName);
display = defaultDisplay( this.nodeName );
// inline-level elements accept inline-block;
// block-level elements need to be inline with layout
@ -189,14 +197,6 @@ jQuery.fn.extend({
}
}
}
// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
if(jQuery.isArray(val)) {
opt.animatedProperties[name] = val[1];
prop[name] = val[0];
} else {
opt.animatedProperties[name] = easing || opt.specialEasing && opt.specialEasing[name] || opt.easing || 'swing';
}
}
if ( opt.overflow != null ) {
@ -205,13 +205,13 @@ jQuery.fn.extend({
for ( p in prop ) {
e = new jQuery.fx( this, opt, p );
val = prop[p];
val = prop[ p ];
if ( rfxtypes.test(val) ) {
e[ val === "toggle" ? hidden ? "show" : "hide" : val ]();
} else {
parts = rfxnum.exec(val);
parts = rfxnum.exec( val );
start = e.cur();
if ( parts ) {
@ -227,7 +227,7 @@ jQuery.fn.extend({
// If a +=/-= token was provided, we're doing a relative animation
if ( parts[1] ) {
end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
}
e.custom( start, end, unit );
@ -503,10 +503,10 @@ jQuery.fx.prototype = {
this.now = t;
} else {
n = t - this.startTime;
this.state = n / options.duration;
// Perform the easing function, defaults to swing
this.pos = jQuery.easing[options.animatedProperties[this.prop]](this.state, n, 0, 1, options.duration);
this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
this.now = this.start + ((this.end - this.start) * this.pos);
}
// Perform the next step of the animation