From: John Resig <jeresig@gmail.com>
Date: Mon, 11 Oct 2010 20:40:10 +0000 (-0400)
Subject: Merge branch 'bug7141' of http://github.com/csnover/jquery into csnover-bug7141
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=5f30ae3b6fa89c3cc00c8c67305c84f21f76aa68;hp=22ccbf82c8badd1d46f5ea52a0a7d5f3935a9fca;p=jquery.git

Merge branch 'bug7141' of github.com/csnover/jquery into csnover-bug7141
---

diff --git a/src/effects.js b/src/effects.js
index 241dbd0..8662df5 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -49,9 +49,10 @@ jQuery.fn.extend({
 
 		} else {
 			for ( var i = 0, j = this.length; i < j; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-				if ( !old ) {
-					jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
+				var display = jQuery.css( this[i], "display" );
+
+				if ( display !== "none" ) {
+					jQuery.data( this[i], "olddisplay", display );
 				}
 			}
 
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 3c4015a..2dfe834 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -770,3 +770,33 @@ test("animate with per-property easing", function(){
 	});
 
 });
+
+test("hide hidden elements (bug #7141)", function() {
+	expect(3);
+	QUnit.reset();
+
+	var div = jQuery("<div style='display:none'></div>").appendTo("#main");
+	equals( div.css("display"), "none", "Element is hidden by default" );
+	div.hide();
+	ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+	div.show();
+	equals( div.css("display"), "block", "Show a double-hidden element" );
+
+	div.remove();
+});
+
+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 () {
+		ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+		div.show(1, function () {
+			equals( div.css("display"), "block", "Show a double-hidden element" );
+			start();
+		});
+	});
+});