Skip to content

Commit 2f7a4c6

Browse files
committed
Datepicker Tests: fix IE7 test failures by ensuring the datepicker is hidden before showing it.
1 parent 1c1b64f commit 2f7a4c6

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

tests/unit/datepicker/datepicker_options.js

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,38 +1050,40 @@ test("Ticket 6827: formatDate day of year calculation is wrong during day lights
10501050
equal(time, "089");
10511051
});
10521052

1053-
test("Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function(){
1053+
test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler", function() {
10541054
expect( 3 );
1055-
var inp = TestHelpers.datepicker.init("#inp",{
1056-
beforeShow: function(){
1057-
return false;
1058-
}
1059-
}),
1060-
dp = $("#ui-datepicker-div");
1061-
inp.datepicker("show");
1062-
equal(dp.css("display"), "none","beforeShow returns false");
1063-
inp.datepicker("destroy");
10641055

1065-
inp = TestHelpers.datepicker.init("#inp",{
1066-
beforeShow: function(){
1056+
var inp, dp;
1057+
1058+
inp = TestHelpers.datepicker.init( "#inp", {
1059+
beforeShow: function() {
10671060
}
10681061
});
1069-
dp = $("#ui-datepicker-div");
1070-
inp.datepicker("show");
1071-
equal(dp.css("display"), "block","beforeShow returns nothing");
1072-
inp.datepicker("hide");
1073-
inp.datepicker("destroy");
1062+
dp = $( "#ui-datepicker-div" );
1063+
inp.datepicker( "show" );
1064+
equal( dp.css( "display" ), "block", "beforeShow returns nothing" );
1065+
inp.datepicker( "hide" ).datepicker( "destroy" );
10741066

1075-
inp = TestHelpers.datepicker.init("#inp",{
1076-
beforeShow: function(){
1067+
inp = TestHelpers.datepicker.init( "#inp", {
1068+
beforeShow: function() {
10771069
return true;
10781070
}
10791071
});
1080-
dp = $("#ui-datepicker-div");
1081-
inp.datepicker("show");
1082-
equal(dp.css("display"), "block","beforeShow returns true");
1083-
inp.datepicker("hide");
1084-
inp.datepicker("destroy");
1072+
dp = $( "#ui-datepicker-div" );
1073+
inp.datepicker( "show" );
1074+
equal( dp.css( "display" ), "block", "beforeShow returns true" );
1075+
inp.datepicker( "hide" );
1076+
inp.datepicker( "destroy" );
1077+
1078+
inp = TestHelpers.datepicker.init( "#inp", {
1079+
beforeShow: function() {
1080+
return false;
1081+
}
1082+
});
1083+
dp = $( "#ui-datepicker-div" );
1084+
inp.datepicker( "show" );
1085+
equal( dp.css( "display" ), "none","beforeShow returns false" );
1086+
inp.datepicker( "destroy" );
10851087
});
10861088

10871089
})(jQuery);

0 commit comments

Comments
 (0)