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

Effects: Respect display value on inline elements

Browse Source 
Take "olddisplay" value into the account

Fixes #14824
Closes gh-1566
Ref 73fe17299a

(cherry-picked from c34dbf5a8d)
Conflicts:
	src/effects.js
This commit is contained in:
Oleg Gaidarenko 2014-04-26 21:24:05 +04:00
parent 874304fc30
commit f833c9af57
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/effects.js vendored
View File

@ -116,7 +116,7 @@ function createTween( value, prop, animation ) {
function defaultPrefilter( elem, props, opts ) {
/* jshint validthis: true */
var prop, value, toggle, tween, hooks, oldfire, display,
var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
anim = this,
orig = {},
style = elem.style,
@ -160,9 +160,12 @@ function defaultPrefilter( elem, props, opts ) {
// Set display property to inline-block for height/width
// animations on inline elements that are having width/height animated
display = jQuery.css( elem, "display" );
// Test default display if display is currently "none"
if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" &&
jQuery.css( elem, "float" ) === "none" ) {
checkDisplay = display === "none" ?
jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
// inline-level elements accept inline-block;
// block-level elements need to be inline with layout

3
test/data/testsuite.css
View File

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

24
test/unit/effects.js vendored
View File

@ -2214,4 +2214,28 @@ test( "slideDown() after stop() (#13483)", 2, function() {
clock.tick( 10 );
});
test( "Respect display value on inline elements (#14824)", 2, function() {
var clock = this.clock,
fromStyleSheet = jQuery( "<span id='span-14824' />" ),
fromStyleAttr = jQuery( "<span style='display: block;' />" );
jQuery( "#qunit-fixture" ).append( fromStyleSheet, fromStyleAttr );
fromStyleSheet.slideUp(function() {
jQuery( this ).slideDown( function() {
equal( jQuery( this ).css( "display" ), "block",
"Respect previous display value (from stylesheet) on span element" );
});
});
fromStyleAttr.slideUp( function() {
jQuery( this ).slideDown( function() {
equal( jQuery( this ).css( "display" ), "block",
"Respect previous display value (from style attribute) on span element" );
});
});
clock.tick( 800 );
});
})();