library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '7608' of https://github.com/rwldrn/jquery into rwldrn-7608

Browse Source
This commit is contained in:
jeresig 2011-01-17 15:50:20 -05:00
commit f01ef93aab
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/css.js
View File

@ -263,8 +263,9 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
if ( document.documentElement.currentStyle ) { if ( document.documentElement.currentStyle ) {
currentStyle = function( elem, name ) { currentStyle = function( elem, name ) {
var left, rsLeft, var left,
ret = elem.currentStyle && elem.currentStyle[ name ], ret = elem.currentStyle && elem.currentStyle[ name ],
rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
style = elem.style; style = elem.style;
// From the awesome hack by Dean Edwards // From the awesome hack by Dean Edwards
@ -275,16 +276,19 @@ if ( document.documentElement.currentStyle ) {
if ( !rnumpx.test( ret ) && rnum.test( ret ) ) { if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
// Remember the original values // Remember the original values
left = style.left; left = style.left;
rsLeft = elem.runtimeStyle.left;
// Put in the new values to get a computed value out // Put in the new values to get a computed value out
elem.runtimeStyle.left = elem.currentStyle.left; if ( rsLeft ) {
elem.runtimeStyle.left = elem.currentStyle.left;
}
style.left = name === "fontSize" ? "1em" : (ret || 0); style.left = name === "fontSize" ? "1em" : (ret || 0);
ret = style.pixelLeft + "px"; ret = style.pixelLeft + "px";
// Revert the changed values // Revert the changed values
style.left = left; style.left = left;
elem.runtimeStyle.left = rsLeft; if ( rsLeft ) {
elem.runtimeStyle.left = rsLeft;
}
} }
return ret === "" ? "auto" : ret; return ret === "" ? "auto" : ret;

22
test/unit/css.js
View File

@ -320,3 +320,25 @@ test(":visible selector works properly on children with a hidden parent (bug #45
jQuery('#table').css('display', 'none').html('<tr><td>cell</td><td>cell</td></tr>'); jQuery('#table').css('display', 'none').html('<tr><td>cell</td><td>cell</td></tr>');
equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible"); equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible");
}); });
test("internal ref to elem.runtimeStyle (bug #7608)", function () {
expect(1);
var result = true,
val = 10;
jQuery('<div id="bug7608" style="width:200px;border:solid 1px red;">' +
'<div id="test" style="width:0%; background:#000;">&nbsp;</div></div>').appendTo("#main");
try {
// the bug is located within src/css.js
jQuery("#bug7608 #test").animate( { width: val }, 1000);
} catch (e) {
result = false;
}
ok( result, "elem.runtimeStyle does not throw exception" );
jQuery("#bug7608").remove();
});