git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
558d96b
)
Make sure that mixed case alpha filters are handled correctly in IE. Fixes #5632.
author
John Resig
<jeresig@gmail.com>
Tue, 28 Sep 2010 15:57:20 +0000
(08:57 -0700)
committer
John Resig
<jeresig@gmail.com>
Tue, 28 Sep 2010 15:57:20 +0000
(08:57 -0700)
src/css.js
patch
|
blob
|
history
test/unit/css.js
patch
|
blob
|
history
diff --git
a/src/css.js
b/src/css.js
index
61cdc48
..
79ae00e
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,
diff --git
a/test/unit/css.js
b/test/unit/css.js
index
24aba79
..
8802fc0
100644
(file)
--- a/
test/unit/css.js
+++ b/
test/unit/css.js
@@
-112,7
+112,7
@@
if(jQuery.browser.msie) {
jQuery('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
jQuery('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
- var filterVal = "progid:DXImageTransform.Microsoft.alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+ var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
jQuery('#foo').css("filter", filterVal);
equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
jQuery('#foo').css("filter", filterVal);
equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );