|
1713 | 1713 | if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
|
1714 | 1714 | tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
|
1715 | 1715 | }
|
1716 |
| - date = $.timepicker.timezoneAdjust(date, tp_inst.timezone); |
1717 |
| - tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone); |
| 1716 | + date = $.timepicker.timezoneAdjust(date, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()), tp_inst.timezone); |
| 1717 | + tp_date = $.timepicker.timezoneAdjust(tp_date, $.timepicker.timezoneOffsetString(-tp_date.getTimezoneOffset()), tp_inst.timezone); |
1718 | 1718 | }
|
1719 | 1719 |
|
1720 | 1720 | this._updateDatepicker(inst);
|
|
1773 | 1773 | if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
|
1774 | 1774 | tp_inst.timezone = date.getTimezoneOffset() * -1;
|
1775 | 1775 | }
|
1776 |
| - date = $.timepicker.timezoneAdjust(date, tp_inst.timezone); |
| 1776 | + date = $.timepicker.timezoneAdjust(date, tp_inst.timezone, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset())); |
1777 | 1777 | }
|
1778 | 1778 | }
|
1779 | 1779 | return date;
|
|
2102 | 2102 | /**
|
2103 | 2103 | * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
|
2104 | 2104 | * @param {Date} date
|
| 2105 | + * @param {string} fromTimezone formatted like "+0500", "-1245" |
2105 | 2106 | * @param {string} toTimezone formatted like "+0500", "-1245"
|
2106 | 2107 | * @return {Date}
|
2107 | 2108 | */
|
2108 |
| - $.timepicker.timezoneAdjust = function (date, toTimezone) { |
| 2109 | + $.timepicker.timezoneAdjust = function (date, fromTimezone, toTimezone) { |
| 2110 | + var fromTz = $.timepicker.timezoneOffsetNumber(fromTimezone); |
2109 | 2111 | var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
|
2110 | 2112 | if (!isNaN(toTz)) {
|
2111 |
| - date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz); |
| 2113 | + date.setMinutes(date.getMinutes() + (-fromTz) - (-toTz)); |
2112 | 2114 | }
|
2113 | 2115 | return date;
|
2114 | 2116 | };
|
|
0 commit comments