X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=ae472efd1023878ee9726747c6ab467b4ee8ad59;hb=c7a14f13916ca8ed22f9bb6fe40fa104b370211f;hp=626119bc95b8706e773d8c1d576b83cf31e61b34;hpb=5c1725d689c1b5b9a8d3c35aa85c42e71016855b;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 626119b..ae472ef 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -18,7 +18,7 @@ jQuery.fn.extend({
 					if ( elemdisplay[ tagName ] ) {
 						display = elemdisplay[ tagName ];
 					} else {
-						var elem = jQuery("<" + this[i].tagName + " />").appendTo("body");
+						var elem = jQuery("<" + tagName + " />").appendTo("body");
 						
 						display = elem.css("display");
 						if ( display === "none" )
@@ -26,7 +26,7 @@ jQuery.fn.extend({
 						
 						elem.remove();
 						
-						elemdisplay[ this[i].tagName ] = display;
+						elemdisplay[ tagName ] = display;
 					}
 					
 					this[i].style.display = jQuery.data(this[i], "olddisplay", display);
@@ -57,15 +57,18 @@ jQuery.fn.extend({
 	_toggle: jQuery.fn.toggle,
 
 	toggle: function( fn, fn2 ){
+		var bool = typeof fn === "boolean";
+
 		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
 			this._toggle.apply( this, arguments ) :
-			fn ?
+			fn == null || bool ?
+				this.each(function(){
+					var state = bool ? fn : jQuery(this).is(":hidden");
+					jQuery(this)[ state ? "show" : "hide" ]();
+				}) :
 				this.animate({
 					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
+				}, fn, fn2);
 	},
 
 	fadeTo: function(speed,to,callback){
@@ -134,27 +137,6 @@ jQuery.fn.extend({
 		});
 	},
 
-	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || jQuery.isArray(type) ) {
-			fn = type;
-			type = "fx";
-		}
-
-		if ( !type || (typeof type === "string" && !fn) )
-			return queue( this[0], type );
-
-		return this.each(function(){
-			if ( jQuery.isArray(fn) )
-				queue(this, type, fn);
-			else {
-				queue(this, type).push( fn );
-
-				if ( queue(this, type).length == 1 )
-					fn.call(this);
-			}
-		});
-	},
-
 	stop: function(clearQueue, gotoEnd){
 		var timers = jQuery.timers;
 
@@ -194,33 +176,6 @@ jQuery.each({
 	};
 });
 
-var queue = function( elem, type, 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;
-};
-
-jQuery.fn.dequeue = function(type){
-	type = type || "fx";
-
-	return this.each(function(){
-		var q = queue(this, type);
-
-		q.shift();
-
-		if ( q.length )
-			q[0].call( this );
-	});
-};
-
 jQuery.extend({
 
 	speed: function(speed, easing, fn) {