X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=178ed0a3a1d2dde4be098351b9bbc7bda188a35d;hb=6e868bb091f14a534c898c7a47e6fecd3e403b60;hp=7fd11462a683e7baa71fab228ee49407abaf9940;hpb=954554e2390772fda9a27fdd0c651b5ad76bca16;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 7fd1146..178ed0a 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -62,7 +62,7 @@ function jQuery(a,c) {
 
 	// Watch for when an array is passed in
 	this.get( a.constructor == Array || a.length && a[0] != undefined && a[0].nodeType ?
-		// Assume that it's an array of DOM Elements
+		// Assume that it is an array of DOM Elements
 		jQuery.merge( a, [] ) :
 
 		// Find the matching elements and save them for later
@@ -1176,19 +1176,21 @@ 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 );
 	},
 
-	curCSS: function(e,p) {
+	curCSS: function(e,p,force) {
 		var r;
 	
-		if (e.style[p])
+		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