github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-06 18:14:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #10416. Don't trust computed styles on detached elements. Close gh-941.

Browse Source
This commit is contained in:
Oleg
2012-09-29 00:56:49 +04:00
committed by Dave Methvin
parent 5be4c10cf7
commit bea5ecbba7
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/css.js
View File

@@ -44,12 +44,14 @@ function vendorPropName( style, name ) {
}
function isHidden( elem, el ) {
// isHidden might be called from jQuery#filter function;
// in that case, element will be second argument
elem = el || elem;
return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
return curCSS( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
}
function showHide( elements, show ) {
var elem, display,
var elem,
values = [],
index = 0,
length = elements.length;
@@ -73,12 +75,8 @@ function showHide( elements, show ) {
if ( elem.style.display === "" && isHidden( elem ) ) {
values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
}
} else {
display = curCSS( elem, "display" );
if ( !values[ index ] && display !== "none" ) {
jQuery._data( elem, "olddisplay", display );
}
} else if ( !values[ index ] && !isHidden( elem ) ) {
jQuery._data( elem, "olddisplay", curCSS( elem, "display" ) );
}
}