Commit 5a8f7693 authored by Oleg Gaidarenko's avatar Oleg Gaidarenko Committed by Dave Methvin

CSS: jQuery#hide should always save display value

Fixes #14750
Closes gh-1509
parent 85af4e64
...@@ -177,13 +177,10 @@ function showHide( elements, show ) { ...@@ -177,13 +177,10 @@ function showHide( elements, show ) {
values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) ); values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
} }
} else { } else {
hidden = isHidden( elem );
if ( !values[ index ] ) { if ( display !== "none" || !hidden ) {
hidden = isHidden( elem ); data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
if ( display && display !== "none" || !hidden ) {
data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css(elem, "display") );
}
} }
} }
} }
......
...@@ -1048,6 +1048,16 @@ asyncTest( "Make sure initialized display value for disconnected nodes is correc ...@@ -1048,6 +1048,16 @@ asyncTest( "Make sure initialized display value for disconnected nodes is correc
jQuery._removeData( jQuery("#display")[ 0 ] ); jQuery._removeData( jQuery("#display")[ 0 ] );
}); });
test( "show() after hide() should always set display to initial value (#14750)", 1, function() {
var div = jQuery( "<div />" ),
fixture = jQuery( "#qunit-fixture" );
fixture.append( div );
div.css( "display", "inline" ).hide().show().css( "display", "list-item" ).hide().show();
equal( div.css( "display" ), "list-item", "should get last set display value" );
});
// Support: IE < 11, Safari < 7 // Support: IE < 11, Safari < 7
// We have to jump through the hoops here in order to test work with "order" CSS property, // We have to jump through the hoops here in order to test work with "order" CSS property,
// that some browsers do not support. This test is not, strictly speaking, correct, // that some browsers do not support. This test is not, strictly speaking, correct,
......
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