Changeset 4013

Timestamp:

12/04/07 18:15:27 (1 year ago)

Author:

davidserduke

Message:

Fixed #1438 where a filter could be set in IE but not have opacity in it. The JS error was fixed by checking to make sure 'opacity=' is in the filter before seeing what its value is.

Location:

trunk/jquery

Files:

• src/core.js (modified) (1 diff)
• test/unit/core.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -1065 +1065 @@
                 }
     
-                return elem.filter ? 
+                return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
                     (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
                     "";

trunk/jquery/test/unit/core.js

@@ -381 +381 @@
 
 test("css(String, Object)", function() {
-    expect(18);
+    expect(19);
     ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
     $('#foo').css('display', 'none');
@@ -405 +405 @@
     $('#foo').css('opacity', '');
     ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+    // for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+    if (jQuery.browser.msie) {
+        $('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
+    }
+    equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
 });