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

CSS: jQuery#hide should always save display value

Browse Source 
Fixes #14750
Closes gh-1509
(cherry picked from commit 5a8f769332)

Conflicts:
	src/css.js
This commit is contained in:
Oleg Gaidarenko 2014-02-05 09:54:15 +04:00 committed by Dave Methvin
parent 9ec429cf62
commit 6dcca6da36
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/css.js
View File

@ -92,13 +92,10 @@ function showHide( elements, show ) {
values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) ); values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
} }
} else { } else {
hidden = isHidden( elem );
if ( !values[ index ] ) { if ( display && display !== "none" || !hidden ) {
hidden = isHidden( elem ); jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
if ( display && display !== "none" || !hidden ) {
jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
}
} }
} }
} }

10
test/unit/css.js
View File

@ -1106,6 +1106,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,