deac
/
jquery
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #7397; Adds 4 supporting unit tests.

1.7/enhancement_8685
rwldrn 2010-11-09 23:18:16 -05:00 committed by jeresig
parent a64dc04050
commit 795e880bba
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects.js vendored
View File

@ -61,10 +61,10 @@ jQuery.fn.extend({
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
if ( display !== "none" ) {
jQuery.data( this[i], "olddisplay", display );
}
if ( !jQuery.data( this[i], "olddisplay" ) && display !== "none" ) {
jQuery.data( this[i], "olddisplay", display );
}
}
// Set the display of the elements in a second loop

35
test/unit/effects.js vendored
View File

@ -130,6 +130,41 @@ test("show(Number) - other displays", function() {
});
});
// Supports #7397
test("Persist correct display value", function() {
expect(4);
QUnit.reset();
stop();
// #show-tests * is set display: none in CSS
jQuery("#main").append('<div id="show-tests"><span style="position:absolute;"></span></div>');
var $span = jQuery("#show-tests span"),
orig = $span.css("display"),
num = 0;
equal(orig, "none", "Expecting to start at display: none");
$span.text('Saving...').fadeIn(100, function() {
equal($span.css("display"), "block", "Expecting display: block");
$span.text('Saved!').fadeOut(100, function () {
equal($span.css("display"), "none", "Expecting display: none");
$span.text('Saving...').fadeIn(100, function() {
equal($span.css("display"), "block", "Expecting display: block");
start();
});
});
});
});
test("animate(Hash, Object, Function)", function() {
expect(1);
stop();