git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure setting opacity does not clobber other inline filters. Fixes #7101.
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
61cdc48
..
4bf818e
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-1,6
+1,6
@@
(function( jQuery ) {
(function( jQuery ) {
-var ralpha = /alpha\([^)]*\)/,
+var ralpha = /alpha\([^)]*\)/i,
ropacity = /opacity=([^)]*)/,
rdashAlpha = /-([a-z])/ig,
rupper = /([A-Z])/g,
ropacity = /opacity=([^)]*)/,
rdashAlpha = /-([a-z])/ig,
rupper = /([A-Z])/g,
@@
-204,7
+204,7
@@
if ( !jQuery.support.opacity ) {
style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
- opacity;
+ style.filter + ' ' + opacity;
}
};
}
}
};
}