X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=178ed0a3a1d2dde4be098351b9bbc7bda188a35d;hb=785d500cac31619b53f976fa122d1f1d10b721a5;hp=f987c86d20e6714f5035094a9eff8af7adb51099;hpb=29a059142123a8bde16de2e579e7708a86a8de78;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index f987c86..178ed0a 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 );
 	},
@@ -1186,9 +1187,10 @@ jQuery.extend({
 	
 		if (!force && e.style[p])
 			r = e.style[p];
-		else if (e.currentStyle)
+		else if (e.currentStyle) {
+			p = p.replace(/\-(\w)/g,function(m,c){return c.toUpperCase()}); 
 			r = e.currentStyle[p];
-		else if (document.defaultView && document.defaultView.getComputedStyle) {
+		} else if (document.defaultView && document.defaultView.getComputedStyle) {
 			p = p.replace(/([A-Z])/g,"-$1").toLowerCase();
 			var s = document.defaultView.getComputedStyle(e,"");
 			r = s ? s.getPropertyValue(p) : null;
@@ -1724,6 +1726,8 @@ jQuery.extend({
 		},
 		
 		handle: function(event) {
+			if ( typeof jQuery == "undefined" ) return;
+
 			event = event || jQuery.event.fix( window.event );
 	
 			// If no correct event was found, fail