diff options
| author | Trent Richardson <trentrichardson@users.noreply.github.com> | 2016-03-22 10:08:22 -0400 |
|---|---|---|
| committer | Trent Richardson <trentrichardson@users.noreply.github.com> | 2016-03-22 10:08:22 -0400 |
| commit | 30277c2992903cd994447159e2f93fe126353cd3 (patch) | |
| tree | 9f702177dd8c1a41aa395d3ffaff8f27aec7fb77 /src | |
| parent | 60b93e495387488a890c7e5aa2e834deb3fdb17a (diff) | |
| parent | 07888e3e24b7c4c6572cca3f5f42b71e3dd68e5e (diff) | |
| download | jQuery-Timepicker-Addon-30277c2992903cd994447159e2f93fe126353cd3.zip jQuery-Timepicker-Addon-30277c2992903cd994447159e2f93fe126353cd3.tar.gz jQuery-Timepicker-Addon-30277c2992903cd994447159e2f93fe126353cd3.tar.bz2 | |
Merge pull request #871 from 560889223/fix/timezone
Fix TimeZone conversion
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index d38d665..d4d2af0 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -1713,8 +1713,8 @@ if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) { tp_inst.timezone = tp_date.getTimezoneOffset() * -1; } - date = $.timepicker.timezoneAdjust(date, tp_inst.timezone); - tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone); + date = $.timepicker.timezoneAdjust(date, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()), tp_inst.timezone); + tp_date = $.timepicker.timezoneAdjust(tp_date, $.timepicker.timezoneOffsetString(-tp_date.getTimezoneOffset()), tp_inst.timezone); } this._updateDatepicker(inst); @@ -1773,7 +1773,7 @@ if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) { tp_inst.timezone = date.getTimezoneOffset() * -1; } - date = $.timepicker.timezoneAdjust(date, tp_inst.timezone); + date = $.timepicker.timezoneAdjust(date, tp_inst.timezone, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset())); } } return date; @@ -2102,13 +2102,15 @@ /** * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate) * @param {Date} date + * @param {string} fromTimezone formatted like "+0500", "-1245" * @param {string} toTimezone formatted like "+0500", "-1245" * @return {Date} */ - $.timepicker.timezoneAdjust = function (date, toTimezone) { + $.timepicker.timezoneAdjust = function (date, fromTimezone, toTimezone) { + var fromTz = $.timepicker.timezoneOffsetNumber(fromTimezone); var toTz = $.timepicker.timezoneOffsetNumber(toTimezone); if (!isNaN(toTz)) { - date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz); + date.setMinutes(date.getMinutes() + (-fromTz) - (-toTz)); } return date; }; |