opt = jQuery.speed(speed, easing, callback),
self = this;
- for ( var p in prop )
+ for ( var p in prop ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
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);
jQuery.each( prop, function(name, val){
var e = new jQuery.fx( self, opt, name );
if ( val.constructor == Number )
- e.custom( e.cur(), val );
+ e.custom( e.cur() || 0, val );
else
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
});
+
+ // For JS strict compliance
+ return true;
});
},
complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed,
duration: speed,
- easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
+ easing: fn && easing || easing && easing.constructor != Function && easing
};
opt.duration = (opt.duration && opt.duration.constructor == Number ?
// The styles
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
z.a = function(){
if ( options.step )
jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
else {
y[prop] = parseInt(z.now) + "px";
- y.display = "block"; // Set display property to block for animation
+
+ // Set display property to block for height/width animations
+ if ( prop == "height" || prop == "width" )
+ y.display = "block";
}
};
done = false;
if ( done ) {
- if ( oldDisplay != null ) {
+ if ( options.display != null ) {
// Reset the overflow
- y.overflow = oldOverflow;
+ y.overflow = options.overflow;
// Reset the display
- y.display = oldDisplay;
+ y.display = options.display;
if ( jQuery.css(elem, "display") == "none" )
y.display = "block";
}
var p = n / options.duration;
// Perform the easing function, defaults to swing
- z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
+ z.now = jQuery.easing[options.easing || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration);
// Perform the next step of the animation
z.a();