Commit 2defa486 authored by Colin Snover's avatar Colin Snover

Fixes #7397.

parents c9c9057c efcf1a79
...@@ -61,8 +61,8 @@ jQuery.fn.extend({ ...@@ -61,8 +61,8 @@ jQuery.fn.extend({
} else { } else {
for ( var i = 0, j = this.length; i < j; i++ ) { for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" ); var display = jQuery.css( this[i], "display" );
if ( display !== "none" ) { if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
jQuery.data( this[i], "olddisplay", display ); jQuery.data( this[i], "olddisplay", display );
} }
} }
......
...@@ -130,6 +130,45 @@ test("show(Number) - other displays", function() { ...@@ -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() { test("animate(Hash, Object, Function)", function() {
expect(1); expect(1);
stop(); stop();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment