diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2013-04-07 14:40:26 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2013-04-17 15:24:42 -0400 |
| commit | 0bea0d6d023a6c3c52f692596a0f12cf5bd9676a (patch) | |
| tree | 53f8f428b8fe34960bd3e1bdd9201c8c73acfda4 /tests | |
| parent | 2879b3ac253fb1faf94a815552982a0f6a485a58 (diff) | |
| download | jquery-ui-0bea0d6d023a6c3c52f692596a0f12cf5bd9676a.tar.gz jquery-ui-0bea0d6d023a6c3c52f692596a0f12cf5bd9676a.zip | |
Datepicker Tests: fix IE7 test failures by ensuring the datepicker is hidden before showing it.(cherry picked from commit 2f7a4c669d1e39079bc34b61fdf5713f02d2b739)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/datepicker/datepicker_options.js | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index c1dcfb2b7..64bbc8829 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -1050,38 +1050,40 @@ test("Ticket 6827: formatDate day of year calculation is wrong during day lights equal(time, "089"); }); -test("Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function(){ +test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function() { expect( 3 ); - var inp = TestHelpers.datepicker.init("#inp",{ - beforeShow: function(){ - return false; - } - }), - dp = $("#ui-datepicker-div"); - inp.datepicker("show"); - equal(dp.css("display"), "none","beforeShow returns false"); - inp.datepicker("destroy"); - inp = TestHelpers.datepicker.init("#inp",{ - beforeShow: function(){ + var inp, dp; + + inp = TestHelpers.datepicker.init( "#inp", { + beforeShow: function() { } }); - dp = $("#ui-datepicker-div"); - inp.datepicker("show"); - equal(dp.css("display"), "block","beforeShow returns nothing"); - inp.datepicker("hide"); - inp.datepicker("destroy"); + dp = $( "#ui-datepicker-div" ); + inp.datepicker( "show" ); + equal( dp.css( "display" ), "block", "beforeShow returns nothing" ); + inp.datepicker( "hide" ).datepicker( "destroy" ); - inp = TestHelpers.datepicker.init("#inp",{ - beforeShow: function(){ + inp = TestHelpers.datepicker.init( "#inp", { + beforeShow: function() { return true; } }); - dp = $("#ui-datepicker-div"); - inp.datepicker("show"); - equal(dp.css("display"), "block","beforeShow returns true"); - inp.datepicker("hide"); - inp.datepicker("destroy"); + dp = $( "#ui-datepicker-div" ); + inp.datepicker( "show" ); + equal( dp.css( "display" ), "block", "beforeShow returns true" ); + inp.datepicker( "hide" ); + inp.datepicker( "destroy" ); + + inp = TestHelpers.datepicker.init( "#inp", { + beforeShow: function() { + return false; + } + }); + dp = $( "#ui-datepicker-div" ); + inp.datepicker( "show" ); + equal( dp.css( "display" ), "none","beforeShow returns false" ); + inp.datepicker( "destroy" ); }); })(jQuery); |