diff options
| author | Karl Swedberg <kswedberg@gmail.com> | 2010-10-26 14:37:44 -0700 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-10-26 14:37:44 -0700 |
| commit | 6ab402dced3339d24ad007ecf3a6c3f5af3e7610 (patch) | |
| tree | 785dab95e0f7caf5c4c9f269b328e02c55c228e0 /test/unit/effects.js | |
| parent | 7066bb384bb4b6e91dac787642f616a4dbc475e5 (diff) | |
| download | jquery-6ab402dced3339d24ad007ecf3a6c3f5af3e7610.tar.gz jquery-6ab402dced3339d24ad007ecf3a6c3f5af3e7610.zip | |
For .show() with no arguments, only set display of elements in the second loop if they don't have style.display already set or if style.display isn't none. Fixes #7315.
Diffstat (limited to 'test/unit/effects.js')
| -rw-r--r-- | test/unit/effects.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index 952afc5b1..0114b0f4c 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -6,7 +6,20 @@ test("sanity check", function() { }); test("show()", function() { - expect(23); + expect(26); + + var 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; |