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

Overflow revert was completely borked when you animated multiple properties (like in .show() or .hide()) (see bug #1343).

Browse source
This commit is contained in:
John Resig 2007-07-05 04:27:46 +00:00
parent 6f064fc9c5
commit 12ebfa3b01
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/fx/fx.js
View file

@ -315,10 +315,22 @@ jQuery.fn.extend({
opt = jQuery.speed(speed, easing, callback), opt = jQuery.speed(speed, easing, callback),
self = this; self = this;
for ( var p in prop ) for ( var p in prop ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return jQuery.isFunction(opt.complete) && opt.complete.apply(this); return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
if ( p == "height" || p == "width" ) {
// Store display property
opt.display = jQuery.css(this, "display");
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
}
}
if ( opt.overflow != null )
this.style.overflow = "hidden";
this.curAnim = jQuery.extend({}, prop); this.curAnim = jQuery.extend({}, prop);
jQuery.each( prop, function(name, val){ jQuery.each( prop, function(name, val){
@ -422,15 +434,6 @@ jQuery.extend({
// The styles // The styles
var y = elem.style; var y = elem.style;
if ( prop == "height" || prop == "width" ) {
// Store display property
var oldDisplay = jQuery.css(elem, "display");
// Make sure that nothing sneaks out
var oldOverflow = y.overflow;
y.overflow = "hidden";
}
// Simple function for setting a style value // Simple function for setting a style value
z.a = function(){ z.a = function(){
if ( options.step ) if ( options.step )
@ -529,12 +532,12 @@ jQuery.extend({
done = false; done = false;
if ( done ) { if ( done ) {
if ( oldDisplay != null ) { if ( options.display != null ) {
// Reset the overflow // Reset the overflow
y.overflow = oldOverflow; y.overflow = options.overflow;
// Reset the display // Reset the display
y.display = oldDisplay; y.display = options.display;
if ( jQuery.css(elem, "display") == "none" ) if ( jQuery.css(elem, "display") == "none" )
y.display = "block"; y.display = "block";
} }