X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=9aac295b2c4f29f723f6b51d86c85e0d5ccf411c;hb=aa5c4d8828bd8956218ccca47ee7a029fe26008e;hp=02c22fbe03a10ba1482002c2c989c2d5101b9b3d;hpb=e8627fe1555602dc4713c4e848a41642b2654512;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 02c22fb..9aac295 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
@@ -1076,8 +1076,8 @@ new function() {
 		 * @type jQuery
 		 * @param String type An event type
 		 */
-		trigger: function( type ) {
-			jQuery.event.trigger( this, type );
+		trigger: function( type, data ) {
+			jQuery.event.trigger( type, data, this );
 		}
 	};
 	
@@ -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;