Fix #12537, element.css('filter') returns undefined in IE9. Close gh-942.

diff --git a/src/css.js b/src/css.js
index 9e72073eb1149ef10107e26818d30433e20289ab..403516e0feb990a3c8f54193f5c7af52b76abfb3 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -290,7 +290,9 @@ if ( window.getComputedStyle ) {
 
                if ( computed ) {
 
-                       ret = computed[ name ];
+                       // getPropertyValue is only needed for .css('filter') in IE9, see #12537
+                       ret = computed.getPropertyValue( name ) || computed[ name ];
+
                        if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
                                ret = jQuery.style( elem, name );
                        }

diff --git a/test/unit/css.js b/test/unit/css.js
index 30ce95fc9c35f6a4e14a48b2499a6299f474decd..be8597a622b3270e790c40afda66f23961f8be0d 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -782,6 +782,13 @@ test("certain css values of 'normal' should be convertable to a number, see #862
        ok( jQuery.isNumeric( parseFloat( el.css("fontWeight") ) ), "css('fontWeight') not convertable to number, see #8627" );
 });
 
+// only run this test in IE9
+if ( document.documentMode === 9 ) {
+       test( ".css('filter') returns a string in IE9, see #12537", 1, function() {
+               equal( jQuery("<div style='-ms-filter:\"progid:DXImageTransform.Microsoft.gradient(startColorstr=#FFFFFF, endColorstr=#ECECEC)\";'></div>").css("filter"), "progid:DXImageTransform.Microsoft.gradient(startColorstr=#FFFFFF, endColorstr=#ECECEC)", "IE9 returns the correct value from css('filter')." );
+       });
+}
+
 test( "cssHooks - expand", function() {
        expect( 15 );
        var result,

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 70b18146146a27313ec71a498c60cc4175f6c0d8..a11af646abcc42ba3d41555768dc512b288306b1 100644 (file)
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1689,7 +1689,7 @@ asyncTest( "non-px animation handles non-numeric start (#11971)", 2, function()
        var foo = jQuery("#foo"),
                initial = foo.css("backgroundPositionX");
 
-       if ( initial == null ) {
+       if ( !initial ) {
                expect(1);
                ok( true, "Style property not understood" );
                start();