Update to fix for #1064 and tests

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 4370e9da82391c08b696eab9a66cf3354180b406..896130011a7b69afd251466290a8b53199378268 100644 (file)
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -261,9 +261,9 @@ test("css(String|Hash)", function() {
        \r
        $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {\r
                $('#foo').css({opacity: n});\r
-               ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" );\r
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
                $('#foo').css({opacity: parseFloat(n)});\r
-               ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" );\r
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
        });     \r
        $('#foo').css({opacity: ''});\r
        ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );\r
@@ -288,9 +288,9 @@ test("css(String, Object)", function() {
        \r
        $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {\r
                $('#foo').css('opacity', n);\r
-               ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" );\r
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
                $('#foo').css('opacity', parseFloat(n));\r
-               ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" );\r
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
        });\r
        $('#foo').css('opacity', '');\r
        ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );\r

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 30396caccf29f227e5315f6cd4682865d40a49d3..84a1594332674bd481be8fcdc74c5f7f63019ffa 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1403,8 +1403,10 @@ jQuery.extend({
        curCSS: function(elem, prop, force) {
                var ret;
 
-               if (prop == "opacity" && jQuery.browser.msie)
-                       return jQuery.attr(elem.style, "opacity");
+               if (prop == "opacity" && jQuery.browser.msie) {
+                       ret = jQuery.attr(elem.style, "opacity");
+                       return ret == "" ? "1" : ret;
+               }
                
                if (prop == "float" || prop == "cssFloat")
                        prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
@@ -1537,7 +1539,7 @@ jQuery.extend({
                        }
 
                        return elem.filter ? 
-                               (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "1";
+                               (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
                }
                
                // Certain attributes only work when accessed via the old DOM 0 way