X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=e96f6b6f045e66b29725841d42280a369496c599;hb=3e0cc815043c2425819743e907a0ce263a7ce164;hp=952afc5b1e7848b9d2ec5926595a098291aa857b;hpb=97dfa0d5a85a32fe56aba837bbf2bc889b092d2b;p=jquery.git

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 952afc5..e96f6b6 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -6,7 +6,32 @@ test("sanity check", function() {
 });
 
 test("show()", function() {
-	expect(23);
+	expect(28);
+
+	var hiddendiv = jQuery("div.hidden");
+
+	hiddendiv.hide().show();
+
+	equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
+
+	var div = jQuery("<div>").hide().appendTo("body").show();
+
+	equal( div.css("display"), "block", "Make sure pre-hidden divs show" );
+
+	QUnit.reset();
+
+	hiddendiv = jQuery("div.hidden");
+
+	equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
+
+	hiddendiv.css("display", "block");
+	equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
+
+	hiddendiv.show();
+	equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
+
+	hiddendiv.css("display","");
+
 	var pass = true, div = jQuery("#main div");
 	div.show().each(function(){
 		if ( this.style.display == "none" ) pass = false;
@@ -39,7 +64,7 @@ test("show()", function() {
 
 	// #show-tests * is set display: none in CSS
 	jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id="test-table"></table>');
-	
+
 	var old = jQuery("#test-table").show().css("display") !== "table";
 	jQuery("#test-table").remove();
 
@@ -105,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();
@@ -130,7 +194,7 @@ test("animate block as inline width/height", function() {
 
 	var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
 		expected = span.css("display");
-	
+
 	span.remove();
 
 	if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
@@ -156,7 +220,7 @@ test("animate native inline width/height", function() {
 
 	var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
 		expected = span.css("display");
-	
+
 	span.remove();
 
 	if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
@@ -825,7 +889,7 @@ test("hide hidden elements, with animation (bug #7141)", function() {
 	expect(3);
 	QUnit.reset();
 	stop();
-	
+
 	var div = jQuery("<div style='display:none'></div>").appendTo("#main");
 	equals( div.css("display"), "none", "Element is hidden by default" );
 	div.hide(1, function () {