*/
slideToggle: function(speed,callback){
return this.each(function(){
- var state = $(this).is(":hidden") ? "show" : "hide";
- $(this).animate({height: state}, speed, callback);
+ var state = jQuery(this).is(":hidden") ? "show" : "hide";
+ jQuery(this).animate({height: state}, speed, callback);
});
},
* left: 50, opacity: 'show'
* }, 500);
*
+ * @test stop();
+ * var hash = {opacity: 'show'};
+ * var hashCopy = $.extend({}, hash);
+ * $('#foo').animate(hash, 'fast', function() {
+ * ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
+ * start();
+ * });
+ *
* @name animate
* @type jQuery
* @param Hash params A set of style attributes that you wish to animate, and to what end.
animate: function(prop,speed,callback) {
return this.queue(function(){
- this.curAnim = prop;
+ this.curAnim = jQuery.extend({}, prop);
for ( var p in prop ) {
var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
z.a = function(){
if ( options.step )
options.step.apply( elem, [ z.now ] );
-
- if ( prop == "opacity" ) {
- if (jQuery.browser.mozilla && z.now == 1) z.now = 0.9999;
- if (window.ActiveXObject)
- y.filter = "alpha(opacity=" + z.now*100 + ")";
- else
- y.opacity = z.now;
-
- // My hate for IE will never die
- } else if ( parseInt(z.now) )
+
+ if ( prop == "opacity" )
+ jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
+ else if ( parseInt(z.now) ) // My hate for IE will never die
y[prop] = parseInt(z.now) + "px";
y.display = "block";
};
// Simple 'show' function
- z.show = function( p ){
+ z.show = function(){
if ( !z.el.orig ) z.el.orig = {};
// Remember where we started, so that we can go back to it later
z.el.orig[prop] = this.cur();
-
- z.custom( 0, z.el.orig[prop] );
+
+ // Begin the animation
+ z.custom(0, z.el.orig[prop]);
// Stupid IE, look what you made me do
if ( prop != "opacity" )
z.custom(z.el.orig[prop], 0);
};
- // IE has trouble with opacity if it does not have layout
- if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
- y.zoom = "1";
-
// Remember the overflow of the element
- if ( !z.el.oldOverlay )
+ if ( !z.el.oldOverflow )
z.el.oldOverflow = jQuery.css( z.el, "overflow" );
// Make sure that nothing sneaks out
// Reset the property, if the item has been hidden
if ( z.o.hide ) {
for ( var p in z.el.curAnim ) {
- y[ p ] = z.el.orig[p] + ( p == "opacity" ? "" : "px" );
+ if (p == "opacity")
+ jQuery.attr(y, p, z.el.orig[p]);
+ else
+ y[ p ] = z.el.orig[p] + "px";
// set its height and/or width to auto
if ( p == 'height' || p == 'width' )