Backing out commit 795e880bba
- errors popping up in IE 6/7/8.
This commit is contained in:
parent
efaf375e56
commit
86cf820d36
8
src/effects.js
vendored
8
src/effects.js
vendored
|
@ -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 ( !jQuery.data( this[i], "olddisplay" ) && display !== "none" ) {
|
||||
jQuery.data( this[i], "olddisplay", display );
|
||||
}
|
||||
|
||||
if ( display !== "none" ) {
|
||||
jQuery.data( this[i], "olddisplay", display );
|
||||
}
|
||||
}
|
||||
|
||||
// Set the display of the elements in a second loop
|
||||
|
|
35
test/unit/effects.js
vendored
35
test/unit/effects.js
vendored
|
@ -130,41 +130,6 @@ 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();
|
||||
|
|
Loading…
Reference in a new issue