Backing out commit 795e880bba1f7f949df58748f7fd92e50296a8f4 - errors popping up in...

diff --git a/src/effects.js b/src/effects.js
index bac2e1d51393c8d9838b648055b862aa20ee7c4e..51ce0c5772c54dcf6a1e94fc657c917ccbbf06c3 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -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

diff --git a/test/unit/effects.js b/test/unit/effects.js
index aca9263840d92d2bdfd1a21be5c77944d7f85aad..74b336f1f9aea35eae4650e8cc647ad4ff4b5d87 100644 (file)
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -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();