Merge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403

2 files changed, 5 insertions, 2 deletions

diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index 7df76834a..d029b8716 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -1,5 +1,5 @@
 /* for testing opacity set in styles in IE */
-ol#empty { opacity: 0; filter:Alpha(opacity=0); }
+ol#empty { opacity: 0; filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff'); }
 
 div#fx-tests h4 {
         background: red;
diff --git a/test/unit/css.js b/test/unit/css.js
index 4578b1976..621728cd6 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css", { teardown: moduleTeardown });
 
 test("css(String|Hash)", function() {
-	expect(41);
+	expect( 42 );
 
 	equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
 
@@ -58,6 +58,9 @@ test("css(String|Hash)", function() {
 	equals( jQuery('#empty').css('opacity'), '0', "Assert opacity is accessible via filter property set in stylesheet in IE" );
 	jQuery('#empty').css({ opacity: '1' });
 	equals( jQuery('#empty').css('opacity'), '1', "Assert opacity is taken from style attribute when set vs stylesheet in IE with filters" );
+	jQuery.support.opacity ?
+		ok(true, "Requires the same number of tests"):
+		ok( ~jQuery("#empty")[0].currentStyle.filter.indexOf("gradient"), "Assert setting opacity doesn't overwrite other filters of the stylesheet in IE" );
 
 	var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild');