jQuery.fn.extend({
// overwrite the old show method
- //_show: jQuery.fn.show,
+ _show: jQuery.fn.show,
/**
* Show all matched elements using a graceful animation.
},
// Overwrite the old hide method
- //_hide: jQuery.fn.hide,
+ _hide: jQuery.fn.hide,
/**
* Hide all matched elements using a graceful animation.
slideUp: function(speed,callback){
return this.animate({height: "hide"}, speed, callback);
},
+
+ /**
+ * Toggle the visibility of all matched elements by adjusting their height.
+ * Only the height is adjusted for this animation, causing all matched
+ * elements to be hidden in a "sliding" manner.
+ *
+ * @example $("p").slideToggle("slow");
+ *
+ * @name slideToggle
+ * @type jQuery
+ * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
+ * @cat Effects/Animations
+ */
+
+ /**
+ * Toggle the visibility of all matched elements by adjusting their height
+ * and firing a callback function after completion.
+ * Only the height is adjusted for this animation, causing all matched
+ * elements to be hidden in a "sliding" manner.
+ *
+ * @example $("p").slideToggle("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name slideToggle
+ * @type jQuery
+ * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
+ * @param Function callback A function to be executed whenever the animation completes.
+ * @cat Effects/Animations
+ */
+ slideToggle: function(speed,callback){
+ return this.each(function(){
+ var state = jQuery(this).is(":hidden") ? "show" : "hide";
+ jQuery(this).animate({height: state}, speed, callback);
+ });
+ },
/**
* Fade in all matched elements by adjusting their opacity.
},
/**
- * @private
+ * A function for making your own, custom, animations. The key aspect of
+ * this function is the object of style properties that will be animated,
+ * and to what end. Each key within the object represents a style property
+ * that will also be animated (for example: "height", "top", or "opacity").
+ *
+ * The value associated with the key represents to what end the property
+ * will be animated. If a number is provided as the value, then the style
+ * property will be transitioned from its current state to that new number.
+ * Oterwise if the string "hide", "show", or "toggle" is provided, a default
+ * animation will be constructed for that property.
+ *
+ * @example $("p").animate({
+ * height: 'toggle', opacity: 'toggle'
+ * }, "slow");
+ *
+ * @example $("p").animate({
+ * left: 50, opacity: 'show'
+ * }, 500);
+ *
+ * @name animate
+ * @type jQuery
+ * @param Hash params A set of style attributes that you wish to animate, and to what end.
+ * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
+ * @param Function callback A function to be executed whenever the animation completes.
+ * @cat Effects/Animations
*/
animate: function(prop,speed,callback) {
return this.queue(function(){
- var i = 0;
+
+ this.curAnim = prop;
+
for ( var p in prop ) {
- var e = new jQuery.fx( this, jQuery.speed(speed,callback,i++), p );
+ var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
if ( prop[p].constructor == Number )
e.custom( e.cur(), prop[p] );
else
e[ prop[p] ]( prop );
}
+
});
},
}
},
- speed: function(s,o,i) {
+ speed: function(s,o) {
o = o || {};
if ( o.constructor == Function )
if ( o.oldComplete && o.oldComplete.constructor == Function )
o.oldComplete.apply( this );
};
-
- if ( i > 0 )
- o.complete = null;
return o;
},
// The users options
z.o = {
duration: options.duration || 400,
- complete: options.complete
+ complete: options.complete,
+ step: options.step
};
// The element
// Simple function for setting a style value
z.a = function(){
- if ( prop == "opacity" ) {
- if (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 ( options.step )
+ options.step.apply( elem, [ 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";
};
// Get the current size
z.cur = function(){
- return parseFloat( jQuery.curCSS(z.el, prop) ) || z.max();
+ var r = parseFloat( jQuery.curCSS(z.el, prop) );
+ return r && r > -10000 ? r : z.max();
};
// Start an animation from one number to another
// 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
+ if (prop == "opacity")
+ z.custom(z.el.orig[prop], 1);
+ else
+ z.custom(0, z.el.orig[prop]);
// Stupid IE, look what you made me do
if ( prop != "opacity" )
z.o.hide = true;
// Begin the animation
- z.custom(z.cur(),0);
+ 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 )
z.el.oldOverflow = jQuery.css( z.el, "overflow" );
// Make sure that nothing sneaks out
- //if ( z.el.oldOverlay == "visible" )
y.overflow = "hidden";
// Each step of an animation
z.now = lastNum;
z.a();
- // Hide the element if the "hide" operation was done
- if ( z.o.hide ) y.display = 'none';
-
- // Reset the overflow
- y.overflow = z.el.oldOverflow;
-
- // Reset the property, if the item has been hidden
- if ( z.o.hide )
- y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ?
- z.el.orig[prop] + "px" : z.el.orig[prop];
-
- // set its height and/or width to auto
- jQuery.setAuto( z.el, prop );
+ z.el.curAnim[ prop ] = true;
+
+ var done = true;
+ for ( var i in z.el.curAnim )
+ if ( z.el.curAnim[i] !== true )
+ done = false;
+
+ if ( done ) {
+ // Reset the overflow
+ y.overflow = z.el.oldOverflow;
+
+ // Hide the element if the "hide" operation was done
+ if ( z.o.hide )
+ y.display = 'none';
+
+ // Reset the property, if the item has been hidden
+ if ( z.o.hide ) {
+ for ( var p in z.el.curAnim ) {
+ if (p == "opacity" && jQuery.browser.msie)
+ 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' )
+ jQuery.setAuto( z.el, p );
+ }
+ }
+ }
// If a callback was provided, execute it
- if( z.o.complete && z.o.complete.constructor == Function )
+ if( done && z.o.complete && z.o.complete.constructor == Function )
// Execute the complete function
z.o.complete.apply( z.el );
} else {
git.asbjorn.biz / jquery.git / blobdiff