github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

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 );
});
})();