summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrent Richardson <trentrichardson@users.noreply.github.com>2013-11-25 07:51:24 -0800
committerTrent Richardson <trentrichardson@users.noreply.github.com>2013-11-25 07:51:24 -0800
commitb73b6f7d14458518f6f2c8d951bb14f0b67a84db (patch)
tree998a0fd541f15fd21dbbc065f6f367a6d4d20ccb /src
parent11aaecbf7316fd2cf4f3097876278fc438ffc0d0 (diff)
parenteeccc8248a7f575d2e4b9251e72a57febccf507c (diff)
downloadjQuery-Timepicker-Addon-b73b6f7d14458518f6f2c8d951bb14f0b67a84db.zip
jQuery-Timepicker-Addon-b73b6f7d14458518f6f2c8d951bb14f0b67a84db.tar.gz
jQuery-Timepicker-Addon-b73b6f7d14458518f6f2c8d951bb14f0b67a84db.tar.bz2
Merge pull request #669 from gentooboontoo/fix-set-null-date
Fix failure when setting date as null
Diffstat (limited to 'src')
-rw-r--r--src/jquery-ui-timepicker-addon.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 1061296..71ec2cd 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1611,7 +1611,7 @@
// object will only return the timezone offset for the current locale, so we
// adjust it accordingly. If not using timezone option this won't matter..
// If a timezone is different in tp, keep the timezone as is
- if (tp_inst) {
+ if (tp_inst && tp_date) {
// look out for DST if tz wasn't specified
if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
tp_inst.timezone = tp_date.getTimezoneOffset() * -1;