X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=e4c1015611948bde659ceb1b972829e2adcf4473;hb=b9371a6ca4b756c4b4266a08336e80f715b66ad3;hp=4ccb089111387147bae55f8bd40e859e52aa0196;hpb=1d299d375b6d97d65559286d914df2d5a77949db;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 4ccb089..e4c1015 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -126,7 +126,7 @@ jQuery.fn.extend({
 	},
 	
 	queue: function(type, fn){
-		if ( jQuery.isFunction(type) ) {
+		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
 			fn = type;
 			type = "fx";
 		}
@@ -162,6 +162,8 @@ var queue = function( elem, type, array ) {
 	if ( !elem )
 		return;
 
+	type = type || "fx";
+
 	var q = jQuery.data( elem, type + "queue" );
 
 	if ( !q || array )
@@ -220,6 +222,7 @@ jQuery.extend({
 	},
 	
 	timers: [],
+	timerId: null,
 
 	fx: function( elem, options, prop ){
 		this.options = options;
@@ -274,16 +277,18 @@ jQuery.fx.prototype = {
 
 		jQuery.timers.push(t);
 
-		if ( jQuery.timers.length == 1 ) {
-			var timer = setInterval(function(){
+		if ( jQuery.timerId == null ) {
+			jQuery.timerId = setInterval(function(){
 				var timers = jQuery.timers;
 				
 				for ( var i = 0; i < timers.length; i++ )
 					if ( !timers[i]() )
 						timers.splice(i--, 1);
 
-				if ( !timers.length )
-					clearInterval( timer );
+				if ( !timers.length ) {
+					clearInterval( jQuery.timerId );
+					jQuery.timerId = null;
+				}
 			}, 13);
 		}
 	},