X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=933c9bf40138bd010dc453e746e8183eb86daaf2;hb=1d0dec55bad5d848a083084a9ac0c25dc57f9e1b;hp=f67747fd049c214ac56ed9bfba8714d62d151ef1;hpb=027668047a65837daef59efcc5f7042303dd71c3;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index f67747f..933c9bf 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -400,6 +400,8 @@ jQuery.extend({
 		}
 	},
 
+	timers: [],
+
 	/*
 	 * 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
@@ -452,9 +454,20 @@ jQuery.extend({
 			z.now = from;
 			z.a();
 
-			z.timer = setInterval(function(){
-				z.step(from, to);
-			}, 13);
+			jQuery.timers.push(function(){
+				return z.step(from, to);
+			});
+
+			if ( jQuery.timers.length == 1 ) {
+				var timer = setInterval(function(){
+					jQuery.timers = jQuery.grep( jQuery.timers, function(fn){
+						return fn();
+					});
+
+					if ( !jQuery.timers.length )
+						clearInterval( timer );
+				}, 13);
+			}
 		};
 
 		// Simple 'show' function
@@ -462,7 +475,7 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = elem.style[prop];
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			options.show = true;
 
@@ -479,7 +492,7 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = elem.style[prop];
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			options.hide = true;
 
@@ -492,7 +505,7 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = this.style[prop];
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			if(oldDisplay == "none")  {
 				options.show = true;
@@ -516,10 +529,6 @@ jQuery.extend({
 			var t = (new Date()).getTime();
 
 			if (t > options.duration + z.startTime) {
-				// Stop the timer
-				clearInterval(z.timer);
-				z.timer = null;
-
 				z.now = lastNum;
 				z.a();
 
@@ -555,6 +564,8 @@ jQuery.extend({
 				if ( done && jQuery.isFunction( options.complete ) )
 					// Execute the complete function
 					options.complete.apply( elem );
+
+				return false;
 			} else {
 				var n = t - this.startTime;
 				// Figure out where in the animation we are and set the number
@@ -569,6 +580,8 @@ jQuery.extend({
 				// Perform the next step of the animation
 				z.a();
 			}
+
+			return true;
 		};
 	
 	}