Fixes #7397; 4 supporting unit tests

2 files changed, 41 insertions, 5 deletions

diff --git a/src/effects.js b/src/effects.js
index 51ce0c577..f9c682c9f 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -60,11 +60,12 @@ 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 );
-				}
+				var display = jQuery.css( this[i], "display" ), 
+				    old = jQuery.data( this[i], "olddisplay" );
+        
+				if ( !old && 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 74b336f1f..aca926384 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -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();