X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=fx%2Ffx.js;h=19293889651cd747bc0446738acdb666ec885ae7;hb=82e0a5a810f09b601543d3406b65ac15bd22307e;hp=d2bb89d0da170fb44cb9cc63add7f68458733b16;hpb=a457262ef5bcb163417a1f6db0b770f1fc21b3a4;p=jquery.git

diff --git a/fx/fx.js b/fx/fx.js
index d2bb89d..1929388 100644
--- a/fx/fx.js
+++ b/fx/fx.js
@@ -1,198 +1,488 @@
-$.speed = function(s,o) {
-	if ( o && o.constructor == Function ) { o = { onComplete: o }; }
-	o = o || {};
-	var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400};
-	o.duration = typeof s == "number" ? s : ss[s] || 400;
-	return o;
-};
-
-$.fn.hide = function(a,o) {
-	o = $.speed(a,o);
-	return a ? this.each(function(){
-		new $.fx.FadeSize(this,o).hide();
-	}) : this._hide();
-};
-
-$.fn.show = function(a,o) {
-	o = $.speed(a,o);
-	return a ? this.each(function(){
-		new $.fx.FadeSize(this,o).show();
-	}) : this._show();
-};
-
-$.fn.slideDown = function(a,o) {
-	o = $.speed(a,o);
-	return this.each(function(){
-		new $.fx.Resize(this,o).show("height");
-	});
-};
-
-$.fn.slideUp = function(a,o) {
-	o = $.speed(a,o);
-	return this.each(function(){
-		new $.fx.Resize(this,o).hide("height");
-	});
-};
-
-$.fn.fadeOut = function(a,o) {
-	o = $.speed(a,o);
-	return a ? this.each(function(){
-		new $.fx.Opacity(this,o,1).hide();
-	}) : this._hide();
-};
-
-$.fn.fadeIn = function(a,o) {
-	o = $.speed(a,o);
-	return a ? this.each(function(){
-		new $.fx.Opacity(this,o,1).show();
-	}) : this._show();
-};
-
-$.fn.fadeTo = function(a,ev,o) {
-	o = $.speed(a,o);
-	return a ? this.each(function(){
-		ef = new $.fx.Opacity(this,o);
-		ef.custom(ef.cur(),parseFloat(ev));
-		ef.show();
-	}) : this._show();
-};
-
-$.fn.center = function(f) {
-	return this.each(function(){
-		if ( !f && this.nodeName == 'IMG' &&
-				 !this.offsetWidth && !this.offsetHeight ) {
-			var self = this;
-			setTimeout(function(){
-				$(self).center(true);
-			}, 13);
-		} else {
-			var s = this.style;
-			var p = this.parentNode;
-			if ( $.css(p,"position") == 'static' ) {
-				p.style.position = 'relative';
+jQuery.fn.extend({
+
+	// overwrite the old show method
+	//_show: jQuery.fn.show,
+	
+	/**
+	 * Show all matched elements using a graceful animation.
+	 * The height, width, and opacity of each of the matched elements 
+	 * are changed dynamically according to the specified speed.
+	 *
+	 * @example $("p").show("slow");
+	 *
+	 * @name show
+	 * @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).
+	 */
+	 
+	/**
+	 * Show all matched elements using a graceful animation and firing a callback
+	 * function after completion.
+	 * The height, width, and opacity of each of the matched elements 
+	 * are changed dynamically according to the specified speed.
+	 *
+	 * @example $("p").show("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name show
+	 * @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.
+	 */
+	show: function(speed,callback){
+		return speed ? this.animate({
+			height: "show", width: "show", opacity: "show"
+		}, speed, callback) : this._show();
+	},
+	
+	// Overwrite the old hide method
+	//_hide: jQuery.fn.hide,
+	
+	/**
+	 * Hide all matched elements using a graceful animation.
+	 * The height, width, and opacity of each of the matched elements 
+	 * are changed dynamically according to the specified speed.
+	 *
+	 * @example $("p").hide("slow");
+	 *
+	 * @name hide
+	 * @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).
+	 */
+	 
+	/**
+	 * Hide all matched elements using a graceful animation and firing a callback
+	 * function after completion.
+	 * The height, width, and opacity of each of the matched elements 
+	 * are changed dynamically according to the specified speed.
+	 *
+	 * @example $("p").hide("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name hide
+	 * @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.
+	 */
+	hide: function(speed,callback){
+		return speed ? this.animate({
+			height: "hide", width: "hide", opacity: "hide"
+		}, speed, callback) : this._hide();
+	},
+	
+	/**
+	 * Reveal all matched elements by adjusting their height.
+	 * Only the height is adjusted for this animation, causing all matched
+	 * elements to be revealed in a "sliding" manner.
+	 *
+	 * @example $("p").slideDown("slow");
+	 *
+	 * @name slideDown
+	 * @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).
+	 */
+	 
+	/**
+	 * Reveal 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 revealed in a "sliding" manner.
+	 *
+	 * @example $("p").slideDown("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name slideDown
+	 * @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.
+	 */
+	slideDown: function(speed,callback){
+		return this.animate({height: "show"}, speed, callback);
+	},
+	
+	/**
+	 * Hide 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").slideUp("slow");
+	 *
+	 * @name slideUp
+	 * @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).
+	 */
+	 
+	/**
+	 * Hide 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").slideUp("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name slideUp
+	 * @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.
+	 */
+	slideUp: function(speed,callback){
+		return this.animate({height: "hide"}, speed, callback);
+	},
+	
+	/**
+	 * Fade in all matched elements by adjusting their opacity.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeIn("slow");
+	 *
+	 * @name fadeIn
+	 * @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).
+	 */
+	 
+	/**
+	 * Fade in all matched elements by adjusting their opacity and firing a 
+	 * callback function after completion.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeIn("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name fadeIn
+	 * @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.
+	 */
+	fadeIn: function(speed,callback){
+		return this.animate({opacity: "show"}, speed, callback);
+	},
+	
+	/**
+	 * Fade out all matched elements by adjusting their opacity.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeOut("slow");
+	 *
+	 * @name fadeOut
+	 * @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).
+	 */
+	 
+	/**
+	 * Fade out all matched elements by adjusting their opacity and firing a 
+	 * callback function after completion.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeOut("slow",function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name fadeOut
+	 * @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.
+	 */
+	fadeOut: function(speed,callback){
+		return this.animate({opacity: "hide"}, speed, callback);
+	},
+	
+	/**
+	 * Fade the opacity of all matched elements to a specified opacity.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeTo("slow", 0.5);
+	 *
+	 * @name fadeTo
+	 * @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 Number opacity The opacity to fade to (a number from 0 to 1).
+	 */
+	 
+	/**
+	 * Fade the opacity of all matched elements to a specified opacity and 
+	 * firing a callback function after completion.
+	 * Only the opacity is adjusted for this animation, meaning that
+	 * all of the matched elements should already have some form of height
+	 * and width associated with them.
+	 *
+	 * @example $("p").fadeTo("slow", 0.5, function(){
+	 *   alert("Animation Done.");
+	 * });
+	 *
+	 * @name fadeTo
+	 * @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 Number opacity The opacity to fade to (a number from 0 to 1).
+	 * @param Function callback A function to be executed whenever the animation completes.
+	 */
+	fadeTo: function(speed,to,callback){
+		return this.animate({opacity: to}, speed, callback);
+	},
+	
+	/**
+	 * @private
+	 */
+	animate: function(prop,speed,callback) {
+		return this.queue(function(){
+			var i = 0;
+			for ( var p in prop ) {
+				var e = new jQuery.fx( this, jQuery.speed(speed,callback,i++), p );
+				if ( prop[p].constructor == Number )
+					e.custom( e.cur(), prop[p] );
+				else
+					e[ prop[p] ]( prop );
 			}
-			s.position = 'absolute';
-			s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2, 10) + "px";
-			s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2, 10) + "px";
+		});
+	},
+	
+	/**
+	 *
+	 * @private
+	 */
+	queue: function(type,fn){
+		if ( !fn ) {
+			fn = type;
+			type = "fx";
 		}
-  });
-};
-
-$.setAuto = function(e,p) {
-	var a = e.style[p];
-	var o = $.css(e,p);
-	e.style[p] = 'auto';
-	var n = $.css(e,p);
-	if ( o != n ) {
-		e.style[p] = a;
+	
+		return this.each(function(){
+			if ( !this.queue )
+				this.queue = {};
+	
+			if ( !this.queue[type] )
+				this.queue[type] = [];
+	
+			this.queue[type].push( fn );
+		
+			if ( this.queue[type].length == 1 )
+				fn.apply(this);
+		});
 	}
-};
-
-/*
- * I originally wrote fx() as a clone of moo.fx and in the process
- * of making it small in size the code became illegible to sane
- * people. You've been warned.
- */
-
-$.fx = function(el,op,ty,tz){
-	var z = this;
-	z.el = el.constructor==String?document.getElementById(el):el;
-	var y = z.el.style;
-	z.a = function(){z.el.style[ty]=z.now+z.o.unit;};
-	z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur();};
-	z.cur = function(){return parseInt($.getCSS(z.el,ty),10);};
-	z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max());};
-	z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0);};
-	z.ss = function(a){if(y.display!=a){y.display=a;}};
-	z.toggle = function(){if(z.cur()>0){z.hide();}else{z.show();}};
-	z.modify = function(a){z.custom(z.cur(),z.cur()+a);};
-	z.clear = function(){clearInterval(z.timer);z.timer=null;};
-	z.oo = y.overflow;
-	y.overflow = "hidden";
-	z.o = {
-		unit: "px",
-		duration: (op && op.duration) || 400,
-		onComplete: (op && op.onComplete) || op
-	};
-	z.step = function(f,tt){
-		var t = (new Date()).getTime();
-		var p = (t - z.s) / z.o.duration;
-		if (t >= z.o.duration+z.s) {
-			z.now = tt;
-			z.clear();
-			setTimeout(function(){
-				y.overflow = z.oo;
-				if(y.height=="0px"||y.width=="0px"){z.ss("none");}
-				if ( ty != "opacity" && z.o.auto ) {
-					$.setAuto( z.el, "height" );
-					$.setAuto( z.el, "width" );
-				}
-				if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
-			},13);
-		} else {
-			z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (tt-f) + f;
+
+});
+
+jQuery.extend({
+
+	setAuto: function(e,p) {
+		if ( e.notAuto ) return;
+
+		if ( p == "height" && e.scrollHeight != parseInt(jQuery.curCSS(e,p)) ) return;
+		if ( p == "width" && e.scrollWidth != parseInt(jQuery.curCSS(e,p)) ) return;
+
+		// Remember the original height
+		var a = e.style[p];
+
+		// Figure out the size of the height right now
+		var o = jQuery.curCSS(e,p,1);
+
+		if ( p == "height" && e.scrollHeight != o ||
+			p == "width" && e.scrollWidth != o ) return;
+
+		// Set the height to auto
+		e.style[p] = e.currentStyle ? "" : "auto";
+
+		// See what the size of "auto" is
+		var n = jQuery.curCSS(e,p,1);
+
+		// Revert back to the original size
+		if ( o != n && n != "auto" ) {
+			e.style[p] = a;
+			e.notAuto = true;
 		}
-		z.a();
-	};
-	z.custom = function(f,t){
-		if(z.timer) {return null;}
-		this.now=f;z.a();z.io=z.cur();z.s=(new Date()).getTime();
-		z.timer=setInterval(function(){z.step(f,t);}, 13);
-	};
-};
-
-$.fx.fn = ["show","hide","toggle"];
-$.fx.ty = ["Height","Width","Left","Top"];
-
-(function(){
-	for(var $i in $.fx.ty){(function(){
-		var c = $.fx.ty[$i];
-		$.fx[c] = function(a,b){
-			return new $.fx(a,b,c.toLowerCase(),c);
+	},
+	
+	speed: function(s,o,i) {
+		o = o || {};
+		
+		if ( o.constructor == Function )
+			o = { complete: o };
+		
+		var ss = { slow: 600, fast: 200 };
+		o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;
+	
+		// Queueing
+		o.oldComplete = o.complete;
+		o.complete = function(){
+			jQuery.dequeue(this, "fx");
+			if ( o.oldComplete && o.oldComplete.constructor == Function )
+				o.oldComplete.apply( this );
 		};
-	})();}
-})();
-
-$.fx.Opacity = function(a,b,sv){
-	var o = new $.fx(a,b,"opacity");
-	o.cur = function(){return parseFloat(o.el.style.opacity);};
-	o.a = function() {
-		var e = o.el.style;
-		if (o.now == 1) { o.now = 0.9999; }
-		if (window.ActiveXObject) {
-			e.filter = "alpha(opacity=" + o.now*100 + ")";
+		
+		if ( i > 0 )
+			o.complete = null;
+	
+		return o;
+	},
+	
+	queue: {},
+	
+	dequeue: function(elem,type){
+		type = type || "fx";
+	
+		if ( elem.queue && elem.queue[type] ) {
+			// Remove self
+			elem.queue[type].shift();
+	
+			// Get next function
+			var f = elem.queue[type][0];
+		
+			if ( f ) f.apply( elem );
 		}
-		e.opacity = o.now;
-	};
-	o.io = o.now = (sv || o.cur());
-	o.a();
-	return o;
-};
-$.fx.Resize = function(e,o){
-	var z = this;
-	var h = new $.fx.Height(e,o);
-	if(o) { o.onComplete = null; }
-	var w = new $.fx.Width(e,o);
-	function c(a,b,d){return (!a||a==d||b==d);}
-	for(var i in $.fx.fn){(function(){
-		var j = $.fx.fn[i];
-		z[j] = function(a,b){
-			if(c(a,b,"height")) { h[j](); }
-			if(c(a,b,"width")) { w[j](); }
+	},
+
+	/*
+	 * I originally wrote fx() as a clone of moo.fx and in the process
+	 * of making it small in size the code became illegible to sane
+	 * people. You've been warned.
+	 */
+	
+	fx: function( elem, options, prop ){
+	
+		var z = this;
+	
+		// The users options
+		z.o = {
+			duration: options.duration || 400,
+			complete: options.complete
+		};
+	
+		// The element
+		z.el = elem;
+	
+		// The styles
+		var y = z.el.style;
+	
+		// 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) )
+				y[prop] = parseInt(z.now) + "px";
+			y.display = "block";
+		};
+	
+		// Figure out the maximum number to run to
+		z.max = function(){
+			return parseFloat( jQuery.css(z.el,prop) );
+		};
+	
+		// Get the current size
+		z.cur = function(){
+			return parseFloat( jQuery.curCSS(z.el, prop) ) || z.max();
+		};
+	
+		// Start an animation from one number to another
+		z.custom = function(from,to){
+			z.startTime = (new Date()).getTime();
+			z.now = from;
+			z.a();
+	
+			z.timer = setInterval(function(){
+				z.step(from, to);
+			}, 13);
+		};
+	
+		// Simple 'show' function
+		z.show = function( p ){
+			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] );
+
+			// Stupid IE, look what you made me do
+			if ( prop != "opacity" )
+				y[prop] = "1px";
+		};
+	
+		// Simple 'hide' function
+		z.hide = 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.o.hide = true;
+
+			// Begin the animation
+			z.custom(z.cur(),0);
 		};
-	})();}
-	z.modify = function(c,d){
-		h.modify(c);
-		w.modify(d);
-	};
-};
-$.fx.FadeSize = function(e,o){
-	var z = this;
-	var r = new $.fx.Resize(e,o);
-	if(o) { o.onComplete = null; }
-	var p = new $.fx.Opacity(e,o,1);
-	for(var i in $.fx.fn){(function(){
-		var j = $.fx.fn[i];
-		z[j] = function(a,b){p[j]();r[j](a,b);};
-	})();}
-};
+	
+		// 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.step = function(firstNum, lastNum){
+			var t = (new Date()).getTime();
+	
+			if (t > z.o.duration + z.startTime) {
+				// Stop the timer
+				clearInterval(z.timer);
+				z.timer = null;
+
+				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;
+
+				// If a callback was provided, execute it
+				if( z.o.complete && z.o.complete.constructor == Function )
+					// Execute the complete function
+					z.o.complete.apply( z.el );
+
+				// 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 );
+			} else {
+				// Figure out where in the animation we are and set the number
+				var p = (t - this.startTime) / z.o.duration;
+				z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
+	
+				// Perform the next step of the animation
+				z.a();
+			}
+		};
+	
+	}
+
+});