diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-11-30 10:06:38 -0500 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-11-30 10:06:38 -0500 |
| commit | 842046c3e3a933860ad88280269d9e0312fe96a6 (patch) | |
| tree | 68c69fafb80ef157b9ffdf8b67737107c502518d /src | |
| parent | 9e816d41d1e1ba42853da619678a4b41a169af62 (diff) | |
| parent | a8bce5f60c09e6a0c0f3ad8fbc49540085971391 (diff) | |
| download | jQuery-Timepicker-Addon-842046c3e3a933860ad88280269d9e0312fe96a6.zip jQuery-Timepicker-Addon-842046c3e3a933860ad88280269d9e0312fe96a6.tar.gz jQuery-Timepicker-Addon-842046c3e3a933860ad88280269d9e0312fe96a6.tar.bz2 | |
Merge branch 'dev'
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 2 |
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; |