Skip to content

Commit

Permalink
Fixes #7397.
Browse files Browse the repository at this point in the history
  • Loading branch information
csnover committed Dec 14, 2010
2 parents c9c9057 + efcf1a7 commit 2defa48
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/effects.js
Expand Up @@ -61,8 +61,8 @@ jQuery.fn.extend({
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );

if ( display !== "none" ) {
if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
jQuery.data( this[i], "olddisplay", display );
}
}
Expand Down
39 changes: 39 additions & 0 deletions test/unit/effects.js
Expand Up @@ -130,6 +130,45 @@ test("show(Number) - other displays", function() {
});
});



// Supports #7397
test("Persist correct display value", function() {
expect(3);
QUnit.reset();
stop();

// #show-tests * is set display: none in CSS
jQuery("#main").append('<div id="show-tests"><span style="position:absolute;">foo</span></div>');

var $span = jQuery("#show-tests span"),
displayNone = $span.css("display"),
display = '', num = 0;

$span.show();

display = $span.css("display");

$span.hide();

$span.fadeIn(100, function() {

equals($span.css("display"), display, "Expecting display: " + display);

$span.fadeOut(100, function () {

equals($span.css("display"), displayNone, "Expecting display: " + displayNone);

$span.fadeIn(100, function() {

equals($span.css("display"), display, "Expecting display: " + display);

start();
});
});
});
});

test("animate(Hash, Object, Function)", function() {
expect(1);
stop();
Expand Down

0 comments on commit 2defa48

Please sign in to comment.