diff options
author | Colin Snover <colin@alpha.zetafleet.com> | 2010-09-30 11:24:59 -0700 |
---|---|---|
committer | John Resig <jeresig@gmail.com> | 2010-09-30 11:24:59 -0700 |
commit | 06c505d85194890f8bacabc66895a6167b61728a (patch) | |
tree | 7e9aed2ff5bfc36eb7732e044b7e21f86fc12bc3 /test | |
parent | cb811c04b035eb2d652b0831e20ea1d3a4d9c448 (diff) | |
download | jquery-06c505d85194890f8bacabc66895a6167b61728a.tar.gz jquery-06c505d85194890f8bacabc66895a6167b61728a.zip |
Make sure setting opacity does not clobber other inline filters. Fixes #7101.
Diffstat (limited to 'test')
-rw-r--r-- | test/unit/css.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/unit/css.js b/test/unit/css.js index 8802fc00a..468f76386 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -114,11 +114,14 @@ if(jQuery.browser.msie) { 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)"; + var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)"; jQuery('#foo').css("filter", filterVal); equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" ); - jQuery('#foo').css("opacity", 1) - equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't clobber other filters" ); - equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" ) + jQuery('#foo').css("opacity", 1); + equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" ); + equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" ); + jQuery('#foo').css("filter", filterVal3).css("opacity", 1); + ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" ); }); } |