From 06c505d85194890f8bacabc66895a6167b61728a Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Thu, 30 Sep 2010 11:24:59 -0700 Subject: [PATCH] Make sure setting opacity does not clobber other inline filters. Fixes #7101. --- src/css.js | 2 +- test/unit/css.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/css.js b/src/css.js index 79ae00e..4bf818e 100644 --- a/src/css.js +++ b/src/css.js @@ -204,7 +204,7 @@ if ( !jQuery.support.opacity ) { style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : - opacity; + style.filter + ' ' + opacity; } }; } diff --git a/test/unit/css.js b/test/unit/css.js index 8802fc0..468f763 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" ); }); } -- 1.7.10.4