library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #13310. Get the right display value for disconnected nodes. Close gh-1155.

Browse Source
This commit is contained in:
Oleg 2013-02-01 16:57:50 +04:00 committed by Dave Methvin
parent 219a1935ee
commit 8226666b13
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/css.js
View File

@ -51,7 +51,7 @@ function isHidden( elem, el ) {
}
function showHide( elements, show ) {
var elem,
var display, elem, hidden,
values = [],
index = 0,
length = elements.length;
@ -61,11 +61,13 @@ function showHide( elements, show ) {
if ( !elem.style ) {
continue;
}
values[ index ] = jQuery._data( elem, "olddisplay" );
display = elem.style.display;
if ( show ) {
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !values[ index ] && elem.style.display === "none" ) {
if ( !values[ index ] && display === "none" ) {
elem.style.display = "";
}
@ -75,8 +77,15 @@ function showHide( elements, show ) {
if ( elem.style.display === "" && isHidden( elem ) ) {
values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
}
} else if ( !values[ index ] && !isHidden( elem ) ) {
jQuery._data( elem, "olddisplay", jQuery.css( elem, "display" ) );
} else {
if ( !values[ index ] ) {
hidden = isHidden( elem );
if ( display && display !== "none" || !hidden ) {
jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
}
}
}
}

2
test/data/testsuite.css
View File

@ -151,3 +151,5 @@ section { background:#f0f; display:block; }
/* #11971 */
#foo { background: url(1x1.jpg) right bottom no-repeat; }
#display { display: list-item !important; }

1
test/index.html
View File

@ -318,6 +318,7 @@ Z</textarea>
</div>
<div id="fx-tests"></div>
<span id="display"></span>
</div>
</div>
</dl>

23
test/unit/css.js
View File

@ -1010,4 +1010,27 @@ asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Eleme
window.setTimeout( start, 1000 );
});
asyncTest( "Make sure initialized display value for disconnected nodes is correct (#13310)", 4, function() {
var display = jQuery("#display").css("display"),
div = jQuery("<div/>");
equal( div.css( "display", "inline" ).hide().show().appendTo("body").css( "display" ), "inline", "Initialized display value has returned" );
div.remove();
div.css( "display", "none" ).hide();
equal( jQuery._data( div[ 0 ], "olddisplay" ), undefined, "olddisplay is undefined after hiding a detached and hidden element" );
div.remove();
div.css( "display", "inline-block" ).hide().appendTo("body").fadeIn(function() {
equal( div.css( "display" ), "inline-block", "Initialized display value has returned" );
div.remove();
start();
});
equal( jQuery._data( jQuery("#display").css( "display", "inline" ).hide()[ 0 ], "olddisplay" ), display,
"display: * !Important value should used as initialized display" );
jQuery._removeData( jQuery("#display")[ 0 ] );
});
}