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

A pack of animation fixes for #24, #260, #744, #799, #1003, and #1021.

Browse source
This commit is contained in:
John Resig 2007-03-15 16:54:13 +00:00
parent 109e4b2987
commit 027668047a
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/fx/fx.js
View file

@ -413,11 +413,14 @@ jQuery.extend({
// The styles // The styles
var y = elem.style; var y = elem.style;
if ( prop == "height" || prop == "width" ) {
// Store display property // Store display property
var oldDisplay = jQuery.css(elem, "display"); var oldDisplay = jQuery.css(elem, "display");
// Make sure that nothing sneaks out // Make sure that nothing sneaks out
var oldOverflow = y.overflow;
y.overflow = "hidden"; y.overflow = "hidden";
}
// Simple function for setting a style value // Simple function for setting a style value
z.a = function(){ z.a = function(){
@ -426,10 +429,10 @@ jQuery.extend({
if ( prop == "opacity" ) if ( prop == "opacity" )
jQuery.attr(y, "opacity", z.now); // Let attr handle opacity jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
else if ( parseInt(z.now) ) // My hate for IE will never die else {
y[prop] = parseInt(z.now) + "px"; y[prop] = parseInt(z.now) + "px";
y.display = "block"; // Set display property to block for animation y.display = "block"; // Set display property to block for animation
}
}; };
// Figure out the maximum number to run to // Figure out the maximum number to run to
@ -459,12 +462,12 @@ jQuery.extend({
if ( !elem.orig ) elem.orig = {}; if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later // Remember where we started, so that we can go back to it later
elem.orig[prop] = this.cur(); elem.orig[prop] = elem.style[prop];
options.show = true; options.show = true;
// Begin the animation // Begin the animation
z.custom(0, elem.orig[prop]); z.custom(0, this.cur());
// Stupid IE, look what you made me do // Stupid IE, look what you made me do
if ( prop != "opacity" ) if ( prop != "opacity" )
@ -476,12 +479,12 @@ jQuery.extend({
if ( !elem.orig ) elem.orig = {}; if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later // Remember where we started, so that we can go back to it later
elem.orig[prop] = this.cur(); elem.orig[prop] = elem.style[prop];
options.hide = true; options.hide = true;
// Begin the animation // Begin the animation
z.custom(elem.orig[prop], 0); z.custom(this.cur(), 0);
}; };
//Simple 'toggle' function //Simple 'toggle' function
@ -489,7 +492,7 @@ jQuery.extend({
if ( !elem.orig ) elem.orig = {}; if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later // Remember where we started, so that we can go back to it later
elem.orig[prop] = this.cur(); elem.orig[prop] = this.style[prop];
if(oldDisplay == "none") { if(oldDisplay == "none") {
options.show = true; options.show = true;
@ -499,12 +502,12 @@ jQuery.extend({
y[prop] = "1px"; y[prop] = "1px";
// Begin the animation // Begin the animation
z.custom(0, elem.orig[prop]); z.custom(0, this.cur());
} else { } else {
options.hide = true; options.hide = true;
// Begin the animation // Begin the animation
z.custom(elem.orig[prop], 0); z.custom(this.cur(), 0);
} }
}; };
@ -528,13 +531,15 @@ jQuery.extend({
done = false; done = false;
if ( done ) { if ( done ) {
if ( oldDisplay ) {
// Reset the overflow // Reset the overflow
y.overflow = ""; y.overflow = oldOverflow;
// Reset the display // Reset the display
y.display = oldDisplay; y.display = oldDisplay;
if (jQuery.css(elem, "display") == "none") if (jQuery.css(elem, "display") == "none")
y.display = "block"; y.display = "block";
}
// Hide the element if the "hide" operation was done // Hide the element if the "hide" operation was done
if ( options.hide ) if ( options.hide )
@ -543,10 +548,7 @@ jQuery.extend({
// Reset the properties, if the item has been hidden or shown // Reset the properties, if the item has been hidden or shown
if ( options.hide || options.show ) if ( options.hide || options.show )
for ( var p in elem.curAnim ) for ( var p in elem.curAnim )
if (p == "opacity")
jQuery.attr(y, p, elem.orig[p]); jQuery.attr(y, p, elem.orig[p]);
else
y[p] = "";
} }
// If a callback was provided, execute it // If a callback was provided, execute it