Skip to content

Commit eeccc82

Browse files
author
Julien Sanchez
committed
Fix failure when setting date as null
Otherwise, Timepicker is breaking Datepicker compatibility by not accepting null value.
1 parent 11aaecb commit eeccc82

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

src/jquery-ui-timepicker-addon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@
16111611
// object will only return the timezone offset for the current locale, so we
16121612
// adjust it accordingly. If not using timezone option this won't matter..
16131613
// If a timezone is different in tp, keep the timezone as is
1614-
if (tp_inst) {
1614+
if (tp_inst && tp_date) {
16151615
// look out for DST if tz wasn't specified
16161616
if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
16171617
tp_inst.timezone = tp_date.getTimezoneOffset() * -1;

test/SpecRunner.html

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
<link rel="shortcut icon" type="image/png" href="../lib/jasmine-1.3.1/jasmine_favicon.png">
99
<link rel="stylesheet" type="text/css" href="../lib/jasmine-1.3.1/jasmine.css">
10+
<style>
11+
.ui-datepicker {
12+
display: none;
13+
}
14+
</style>
1015
<script type="text/javascript" src="../lib/jasmine-1.3.1/jasmine.js"></script>
1116
<script type="text/javascript" src="../lib/jasmine-1.3.1/jasmine-html.js"></script>
1217
<script type="text/javascript" src="http://github.com/searls/jasmine-fixture/releases/1.0.5/1737/jasmine-fixture.js"></script>

test/jquery-ui-timepicker-addon_spec.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -648,4 +648,17 @@ describe('datetimepicker', function() {
648648
});
649649
});
650650
});
651-
});
651+
652+
describe('methods', function() {
653+
describe('setDate', function() {
654+
it('should accept null as date', function() {
655+
var $input = affix('input').datetimepicker();
656+
$input.datetimepicker('setDate', '2013-11-25 15:30:25');
657+
658+
$input.datetimepicker('setDate', null);
659+
660+
expect($input.datetimepicker('getDate')).toBeNull();
661+
});
662+
});
663+
});
664+
});

0 commit comments

Comments
 (0)