Merge branch 'bug_7397' of https://github.com/rwldrn/jquery into rwldrn-bug_7397
This commit is contained in:
commit
efcf1a7921
2
src/effects.js
vendored
2
src/effects.js
vendored
|
@ -62,7 +62,7 @@ jQuery.fn.extend({
|
|||
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 );
|
||||
}
|
||||
}
|
||||
|
|
39
test/unit/effects.js
vendored
39
test/unit/effects.js
vendored
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue