deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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.

Browse source
This commit is contained in:
David Serduke 2007-12-04 18:15:27 +00:00
parent 4d13f3701c
commit d938c6bbd6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -1064,7 +1064,7 @@ jQuery.extend({
(parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); (parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
} }
return elem.filter ? return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
""; "";
} }

7
test/unit/core.js
View file

@ -380,7 +380,7 @@ test("css(String|Hash)", function() {
}); });
test("css(String, Object)", function() { test("css(String, Object)", function() {
expect(18); expect(19);
ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
$('#foo').css('display', 'none'); $('#foo').css('display', 'none');
ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
@ -404,6 +404,11 @@ test("css(String, Object)", function() {
}); });
$('#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" );
// 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" );
}); });
test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () { test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {