From 9e37da96d12c0f35c766a4724c5d565d0a50ab42 Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Mon, 24 Jul 2006 03:50:15 +0000
Subject: [PATCH] Fixed the opacity problems with IE & animations.

---
 fx/fx.js         |   15 ++++++++-------
 jquery/jquery.js |    3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/fx/fx.js b/fx/fx.js
index bd34c30..ec3d217 100644
--- a/fx/fx.js
+++ b/fx/fx.js
@@ -172,8 +172,7 @@ jQuery.extend({
 			// Get next function
 			var f = elem.queue[type][0];
 		
-			if ( f )
-				f.apply( elem );
+			if ( f ) f.apply( elem );
 		}
 	},
 
@@ -205,11 +204,12 @@ jQuery.extend({
 				if (z.now == 1) z.now = 0.9999;
 				if (window.ActiveXObject)
 					y.filter = "alpha(opacity=" + z.now*100 + ")";
-				y.opacity = z.now;
+				else
+					y.opacity = z.now;
 
 			// My hate for IE will never die
 			} else if ( parseInt(z.now) )
-					y[prop] = parseInt(z.now) + "px";
+				y[prop] = parseInt(z.now) + "px";
 		};
 	
 		// Figure out the maximum number to run to
@@ -219,7 +219,7 @@ jQuery.extend({
 	
 		// Get the current size
 		z.cur = function(){
-			return parseFloat( jQuery.curCSS(z.el,prop) ) || z.max();
+			return parseFloat( jQuery.curCSS(z.el, prop) ) || z.max();
 		};
 	
 		// Start an animation from one number to another
@@ -266,7 +266,7 @@ jQuery.extend({
 	
 		// IE has trouble with opacity if it does not have layout
 		if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
-			y.zoom = 1;
+			y.zoom = "1";
 	
 		// Remember  the overflow of the element
 		z.oldOverflow = y.overflow;
@@ -299,7 +299,8 @@ jQuery.extend({
 
 				// Reset the property, if the item has been hidden
 				if ( z.o.hide )
-					y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ? z.el.orig[prop] + "px" : z.el.orig[prop];
+					y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ?
+						z.el.orig[prop] + "px" : z.el.orig[prop];
 
 				// set its height and/or width to auto
 				jQuery.setAuto( z.el, prop );
diff --git a/jquery/jquery.js b/jquery/jquery.js
index f987c86..4f26b4c 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -1176,7 +1176,8 @@ jQuery.extend({
 			});
 	
 			return p == "height" ? oHeight : oWidth;
-		}
+		} else if ( p == "opacity" && jQuery.browser.msie )
+			return parseFloat(  jQuery.curCSS(e,"filter").replace(/[^0-9.]/,"") ) || 1;
 
 		return jQuery.curCSS( e, p );
 	},
-- 
1.7.10.4