Skip to content

J
jquery
Commit 7ad613c5 authored by Brandon Aaron's avatar Brandon Aaron
Browse files
Options

Update to fix for #1064 and tests

parent 26034c4a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
src/jquery/coreTest.js
View file @ 7ad613c5
...@@ -261,9 +261,9 @@ test("css(String|Hash)", function() { ...@@ -261,9 +261,9 @@ test("css(String|Hash)", function() {
$.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
$('#foo').css({opacity: n}); $('#foo').css({opacity: n});
ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" ); ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
$('#foo').css({opacity: parseFloat(n)}); $('#foo').css({opacity: parseFloat(n)});
ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" ); ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
}); });
$('#foo').css({opacity: ''}); $('#foo').css({opacity: ''});
ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
...@@ -288,9 +288,9 @@ test("css(String, Object)", function() { ...@@ -288,9 +288,9 @@ test("css(String, Object)", function() {
$.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
$('#foo').css('opacity', n); $('#foo').css('opacity', n);
ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" ); ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
$('#foo').css('opacity', parseFloat(n)); $('#foo').css('opacity', parseFloat(n));
ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" ); ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
}); });
$('#foo').css('opacity', ''); $('#foo').css('opacity', '');
ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
......
src/jquery/jquery.js
View file @ 7ad613c5
...@@ -1403,8 +1403,10 @@ jQuery.extend({ ...@@ -1403,8 +1403,10 @@ jQuery.extend({
curCSS: function(elem, prop, force) { curCSS: function(elem, prop, force) {
var ret; var ret;
if (prop == "opacity" && jQuery.browser.msie) if (prop == "opacity" && jQuery.browser.msie) {
return jQuery.attr(elem.style, "opacity"); ret = jQuery.attr(elem.style, "opacity");
return ret == "" ? "1" : ret;
}
if (prop == "float" || prop == "cssFloat") if (prop == "float" || prop == "cssFloat")
prop = jQuery.browser.msie ? "styleFloat" : "cssFloat"; prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
...@@ -1537,7 +1539,7 @@ jQuery.extend({ ...@@ -1537,7 +1539,7 @@ jQuery.extend({
} }
return elem.filter ? 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 // Certain attributes only work when accessed via the old DOM 0 way
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment