X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=64449865bfdaae25088180d726acb6e6a41f5eee;hb=692d676e993b198e30c8940ab61745d7578229bf;hp=14dfa55f9eac9a58d03b370ee93339bd4e53387a;hpb=34d40c3aee0d7d49e5f36868ad307206ecdf0f27;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 14dfa55..6444986 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -173,8 +173,8 @@ jQuery.fn.extend({
 	 */
 	slideToggle: function(speed,callback){
 		return this.each(function(){
-			var state = $(this).is(":hidden") ? "show" : "hide";
-			$(this).animate({height: state}, speed, callback);
+			var state = jQuery(this).is(":hidden") ? "show" : "hide";
+			jQuery(this).animate({height: state}, speed, callback);
 		});
 	},
 	
@@ -315,7 +315,7 @@ jQuery.fn.extend({
 	animate: function(prop,speed,callback) {
 		return this.queue(function(){
 		
-			this.curAnim = prop;
+			this.curAnim = jQuery.extend({}, prop);
 			
 			for ( var p in prop ) {
 				var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
@@ -447,16 +447,10 @@ jQuery.extend({
 		z.a = function(){
 			if ( options.step )
 				options.step.apply( elem, [ z.now ] );
-
-			if ( prop == "opacity" ) {
-				if (jQuery.browser.mozilla && z.now == 1) z.now = 0.9999;
-				if (window.ActiveXObject)
-					y.filter = "alpha(opacity=" + z.now*100 + ")";
-				else
-					y.opacity = z.now;
-
-			// My hate for IE will never die
-			} else if ( parseInt(z.now) )
+ 
+			if ( prop == "opacity" )
+				jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
+			else if ( parseInt(z.now) ) // My hate for IE will never die
 				y[prop] = parseInt(z.now) + "px";
 				
 			y.display = "block";
@@ -485,13 +479,16 @@ jQuery.extend({
 		};
 	
 		// Simple 'show' function
-		z.show = function( p ){
+		z.show = function(){
 			if ( !z.el.orig ) z.el.orig = {};
 
 			// Remember where we started, so that we can go back to it later
 			z.el.orig[prop] = this.cur();
-
-			z.custom( 0, z.el.orig[prop] );
+			
+			var start = z.el.orig[prop];
+			
+			// Begin the animation
+			z.custom(0, z.el.orig[prop]);
 
 			// Stupid IE, look what you made me do
 			if ( prop != "opacity" )
@@ -511,12 +508,8 @@ jQuery.extend({
 			z.custom(z.el.orig[prop], 0);
 		};
 	
-		// IE has trouble with opacity if it does not have layout
-		if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
-			y.zoom = "1";
-	
 		// Remember  the overflow of the element
-		if ( !z.el.oldOverlay )
+		if ( !z.el.oldOverflow )
 			z.el.oldOverflow = jQuery.css( z.el, "overflow" );
 	
 		// Make sure that nothing sneaks out
@@ -552,7 +545,10 @@ jQuery.extend({
 					// Reset the property, if the item has been hidden
 					if ( z.o.hide ) {
 						for ( var p in z.el.curAnim ) {
-							y[ p ] = z.el.orig[p] + ( p == "opacity" ? "" : "px" );
+							if (p == "opacity")
+								jQuery.attr(y, p, z.el.orig[p]);
+							else
+								y[ p ] = z.el.orig[p] + "px";
 	
 							// set its height and/or width to auto
 							if ( p == 'height' || p == 'width' )