Skip to content
Permalink
Browse files

Fixes #7397.

  • Loading branch information...
csnover committed Dec 14, 2010
2 parents c9c9057 + efcf1a7 commit 2defa4863a114358e03dbae1b10521555fd9cd9c
Showing with 41 additions and 2 deletions.
  1. +2 −2 src/effects.js
  2. +39 −0 test/unit/effects.js
@@ -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 );
}
}
@@ -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();

0 comments on commit 2defa48

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