Merge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403
This commit is contained in:
commit
430d9e0b06
3 changed files with 9 additions and 5 deletions
|
@ -231,7 +231,8 @@ if ( !jQuery.support.opacity ) {
|
|||
},
|
||||
|
||||
set: function( elem, value ) {
|
||||
var style = elem.style;
|
||||
var style = elem.style,
|
||||
currentStyle = elem.currentStyle;
|
||||
|
||||
// IE has trouble with opacity if it does not have layout
|
||||
// Force it by setting the zoom level
|
||||
|
@ -241,11 +242,11 @@ if ( !jQuery.support.opacity ) {
|
|||
var opacity = jQuery.isNaN(value) ?
|
||||
"" :
|
||||
"alpha(opacity=" + value * 100 + ")",
|
||||
filter = style.filter || "";
|
||||
filter = currentStyle && currentStyle.filter || style.filter || "";
|
||||
|
||||
style.filter = ralpha.test(filter) ?
|
||||
filter.replace(ralpha, opacity) :
|
||||
style.filter + ' ' + opacity;
|
||||
filter + " " + opacity;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue