X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx.js;h=bc14d3231048322bc793239ab3114b4b2c36a3ca;hb=ab551c2b14ac6b0511cf3da10ca224ce461a0f10;hp=9dcedbfdf620bd98a8bccba4b4c93a5099ae0ae9;hpb=aacdeeb48d551c12939b91f395e3521f761ab945;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 9dcedbf..bc14d32 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -112,16 +112,16 @@ jQuery.fn.extend({
 	},
 
 	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
+		if ( jQuery.isFunction(type) || jQuery.isArray(type) ) {
 			fn = type;
 			type = "fx";
 		}
 
-		if ( !type || (typeof type == "string" && !fn) )
+		if ( !type || (typeof type === "string" && !fn) )
 			return queue( this[0], type );
 
 		return this.each(function(){
-			if ( fn.constructor == Array )
+			if ( jQuery.isArray(fn) )
 				queue(this, type, fn);
 			else {
 				queue(this, type).push( fn );
@@ -201,16 +201,15 @@ jQuery.fn.dequeue = function(type){
 jQuery.extend({
 
 	speed: function(speed, easing, fn) {
-		var opt = speed && speed.constructor == Object ? speed : {
+		var opt = typeof speed === "object" ? speed : {
 			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing
+			easing: fn && easing || jQuery.isFunction(easing) && easing
 		};
 
-		opt.duration = (opt.duration && opt.duration.constructor == Number ?
-			opt.duration :
-			jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds._default;
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
 
 		// Queueing
 		opt.old = opt.complete;
@@ -278,7 +277,6 @@ jQuery.fx.prototype = {
 		this.unit = unit || this.unit || "px";
 		this.now = this.start;
 		this.pos = this.state = 0;
-		this.update();
 
 		var self = this;
 		function t(gotoEnd){
@@ -289,7 +287,7 @@ jQuery.fx.prototype = {
 
 		jQuery.timers.push(t);
 
-		if ( jQuery.timerId == null ) {
+		if ( t() && jQuery.timerId == null ) {
 			jQuery.timerId = setInterval(function(){
 				var timers = jQuery.timers;
 
@@ -337,7 +335,7 @@ jQuery.fx.prototype = {
 	step: function(gotoEnd){
 		var t = now();
 
-		if ( gotoEnd || t > this.options.duration + this.startTime ) {
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
 			this.now = this.end;
 			this.pos = this.state = 1;
 			this.update();