git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the opacity problems with IE & animations.
[jquery.git]
/
jquery
/
jquery.js
diff --git
a/jquery/jquery.js
b/jquery/jquery.js
index
02c22fb
..
4f26b4c
100644
(file)
--- 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 ?
// 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
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
*/
* @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,15
+1176,16
@@
jQuery.extend({
});
return p == "height" ? oHeight : oWidth;
});
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 );
},
return jQuery.curCSS( e, p );
},
- curCSS: function(e,p) {
+ curCSS: function(e,p,force) {
var r;
var r;
- if (e.style[p])
+ if (!force && e.style[p])
r = e.style[p];
else if (e.currentStyle)
r = e.currentStyle[p];
r = e.style[p];
else if (e.currentStyle)
r = e.currentStyle[p];