Skip to content
Sign up
This repository

public /jquery Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Landing pull request 530. Fixes coniditional path for tr, td defaultD… 

…isplay() calls. Fixes #10416.

More Details:
 - #530
 - http://bugs.jquery.com/ticket/10416
  • Loading branch information...
commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f 1 parent 749d32a
Rick Waldron authored October 04, 2011 timmywil committed October 04, 2011

Showing 2 changed files with 16 additions and 1 deletion. Show diff stats Hide diff stats

  1. 2  src/effects.js
  2. 15  test/unit/effects.js
2  src/effects.js
View 
@@ -38,7 +38,7 @@ jQuery.fn.extend({
38 38 
 					// Set elements which have been overridden with display: none
39 39 
 					// in a stylesheet to whatever the default browser style is
40 40 
 					// for such an element
41   
-					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
  41 
+					if ( display === "none" || ( display === ""  && jQuery.css( elem, "display" ) === "none" ) ) {
42 42 
 						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
43 43 
 					}
44 44 
 				}
15  test/unit/effects.js
View 
@@ -188,6 +188,21 @@ test("show() resolves correct default display #8099", function() {
188 188
189 189 
 });
190 190
  191 
+test("defaultDisplay() correctly determines tr, td display #10416", function() {
  192 
+
  193 
+	expect( 1 );
  194 
+	var tr = "<tr></tr>",
  195 
+			td = "<td>new</td>";
  196 
+
  197 
+	jQuery( tr ).append( td ).appendTo( "#table" );
  198 
+	jQuery( tr ).hide().append( td ).appendTo( "#table" ).show();
  199 
+
  200 
+	equal(
  201 
+		jQuery( "#table" ).find( "tr" ).eq( 1 ).css( "display" ),
  202 
+		jQuery( "#table" ).find( "tr" ).eq( 0 ).css( "display" ),
  203 
+		"defaultDisplay() returns correct tr display values"
  204 
+	);
  205 
+});
191 206
192 207 
 test("animate(Hash, Object, Function)", function() {
193 208 
 	expect(1);

0 notes on commit 22f2e8b

Please sign in to comment.
Something went wrong with that request. Please try again.