Fix for #1064 and added tests for setting/getting opacity

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index c8dada498742aa5f5efa5dab3d48f43018fac0f4..4370e9da82391c08b696eab9a66cf3354180b406 100644 (file)
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -240,7 +240,7 @@ if ( location.protocol != "file:" ) {
 }\r
 \r
 test("css(String|Hash)", function() {\r
-       expect(8);\r
+       expect(19);\r
        \r
        ok( $('#main').css("display") == 'none', 'Check for css property "display"');\r
        \r
@@ -258,10 +258,19 @@ test("css(String|Hash)", function() {
        ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');\r
        $('#floatTest').css({'font-size': '30px'});\r
        ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');\r
+       \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
+               $('#foo').css({opacity: parseFloat(n)});\r
+               ok( $('#foo').css('opacity') == n, "Assert opacity is " + 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
 });\r
 \r
 test("css(String, Object)", function() {\r
-       expect(7);\r
+       expect(18);\r
        ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');\r
        $('#foo').css('display', 'none');\r
        ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');\r
@@ -276,6 +285,15 @@ test("css(String, Object)", function() {
        ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');\r
        $('#floatTest').css('font-size', '20px');\r
        ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');\r
+       \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
+               $('#foo').css('opacity', parseFloat(n));\r
+               ok( $('#foo').css('opacity') == n, "Assert opacity is " + 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
 });\r
 \r
 test("text()", function() {\r

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 0c00829f6840ee6eb8919a227e7bfcb8d603dd51..0f79216fecf9a3aa0f8d71e09c30e6910644c260 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1537,7 +1537,7 @@ jQuery.extend({
                        }
 
                        return elem.filter ? 
-                               (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
+                               (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : 1;
                }
                
                // Certain attributes only work when accessed via the old DOM 0 way