X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=d76dbdbaeffaa5dbfc4cd84e3da445f68a8641ab;hb=17b1e407d101c5c7f91db633df3a80cd9b4466ae;hp=52225c8a4d6bbac42b068c6c85bc15f8000aaa93;hpb=ffbedf0262b3eea906f39c0115b818d7456a3994;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 52225c8..d76dbdb 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -6,9 +6,15 @@ jQuery.fn.extend({
 			}, speed, callback) :
 			
 			this.filter(":hidden").each(function(){
-				this.style.display = this.oldblock ? this.oldblock : "";
-				if ( jQuery.css(this,"display") == "none" )
-					this.style.display = "block";
+				this.style.display = this.oldblock || "";
+				if ( jQuery.css(this,"display") == "none" ) {
+					var elem = jQuery("<" + this.tagName + " />").appendTo("body");
+					this.style.display = elem.css("display");
+					// handle an edge condition where css is - div { display:none; } or similar
+					if (this.style.display == "none")
+						this.style.display = "block";
+					elem.remove();
+				}
 			}).end();
 	},
 	
@@ -20,8 +26,6 @@ jQuery.fn.extend({
 			
 			this.filter(":visible").each(function(){
 				this.oldblock = this.oldblock || jQuery.css(this,"display");
-				if ( this.oldblock == "none" )
-					this.oldblock = "block";
 				this.style.display = "none";
 			}).end();
 	},
@@ -31,7 +35,7 @@ jQuery.fn.extend({
 	
 	toggle: function( fn, fn2 ){
 		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-			this._toggle( fn, fn2 ) :
+			this._toggle.apply( this, arguments ) :
 			fn ?
 				this.animate({
 					height: "toggle", width: "toggle", opacity: "toggle"
@@ -72,10 +76,10 @@ jQuery.fn.extend({
 			if ( this.nodeType != 1)
 				return false;
 
-			var opt = jQuery.extend({}, optall);
-			var hidden = jQuery(this).is(":hidden"), self = this;
+			var opt = jQuery.extend({}, optall), p,
+				hidden = jQuery(this).is(":hidden"), self = this;
 			
-			for ( var p in prop ) {
+			for ( p in prop ) {
 				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
 					return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
 
@@ -138,9 +142,6 @@ jQuery.fn.extend({
 			return queue( this[0], type );
 
 		return this.each(function(){
-			if ( this.nodeType != 1)
-				return;
-
 			if ( fn.constructor == Array )
 				queue(this, type, fn);
 			else {
@@ -179,17 +180,16 @@ jQuery.fn.extend({
 });
 
 var queue = function( elem, type, array ) {
-	if ( !elem )
-		return;
-
-	type = type || "fx";
-
-	var q = jQuery.data( elem, type + "queue" );
-
-	if ( !q || array )
-		q = jQuery.data( elem, type + "queue", 
-			array ? jQuery.makeArray(array) : [] );
+	if ( elem ){
+	
+		type = type || "fx";
+	
+		var q = jQuery.data( elem, type + "queue" );
+	
+		if ( !q || array )
+			q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
 
+	}
 	return q;
 };
 
@@ -218,7 +218,7 @@ jQuery.extend({
 
 		opt.duration = (opt.duration && opt.duration.constructor == Number ? 
 			opt.duration : 
-			{ slow: 600, fast: 200 }[opt.duration]) || 400;
+			jQuery.fx.speeds[opt.duration]) || 400;
 	
 		// Queueing
 		opt.old = opt.complete;
@@ -280,7 +280,7 @@ jQuery.fx.prototype = {
 
 	// Start an animation from one number to another
 	custom: function(from, to, unit){
-		this.startTime = (new Date()).getTime();
+		this.startTime = now();
 		this.start = from;
 		this.end = to;
 		this.unit = unit || this.unit || "px";
@@ -343,7 +343,7 @@ jQuery.fx.prototype = {
 
 	// Each step of an animation
 	step: function(gotoEnd){
-		var t = (new Date()).getTime();
+		var t = now();
 
 		if ( gotoEnd || t > this.options.duration + this.startTime ) {
 			this.now = this.end;
@@ -401,20 +401,26 @@ jQuery.fx.prototype = {
 
 };
 
-jQuery.fx.step = {
-	scrollLeft: function(fx){
-		fx.elem.scrollLeft = fx.now;
-	},
-
-	scrollTop: function(fx){
-		fx.elem.scrollTop = fx.now;
+jQuery.extend( jQuery.fx, {
+	speeds:{
+		slow: 600,  
+ 		fast: 200  
 	},
-
-	opacity: function(fx){
-		jQuery.attr(fx.elem.style, "opacity", fx.now);
-	},
-
-	_default: function(fx){
-		fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+	step: {
+		scrollLeft: function(fx){
+			fx.elem.scrollLeft = fx.now;
+		},
+	
+		scrollTop: function(fx){
+			fx.elem.scrollTop = fx.now;
+		},
+	
+		opacity: function(fx){
+			jQuery.attr(fx.elem.style, "opacity", fx.now);
+		},
+	
+		_default: function(fx){
+			fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+		}
 	}
-};
+});