Skip to content
Permalink
Browse files

CSS: jQuery#hide should always save display value

Fixes #14750
Closes gh-1509
  • Loading branch information...
markelog authored and dmethvin committed Feb 5, 2014
1 parent 85af4e6 commit 5a8f76933288396b915800a18240aa17d3414201
Showing with 13 additions and 6 deletions.
  1. +3 −6 src/css.js
  2. +10 −0 test/unit/css.js
@@ -177,13 +177,10 @@ function showHide( elements, show ) {
values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
}
} else {
hidden = isHidden( elem );

if ( !values[ index ] ) {
hidden = isHidden( elem );

if ( display && display !== "none" || !hidden ) {
data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css(elem, "display") );
}
if ( 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
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
// 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,

0 comments on commit 5a8f769

Please sign in to comment.
You can’t perform that action at this time.