deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'trentrichardson/dev' into iso8601-tz

Browse source
This commit is contained in:
Jun Omae 2011-08-12 22:51:24 +09:00
parent 6737b60eee 8507859312
commit ceabba803d
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jquery-ui-timepicker-addon.js vendored
View file

@ -1017,7 +1017,17 @@ $.datepicker._gotoToday = function(id) {
var inst = this._getInst($(id)[0]), var inst = this._getInst($(id)[0]),
$dp = inst.dpDiv; $dp = inst.dpDiv;
this._base_gotoToday(id); this._base_gotoToday(id);
this._setTime(this._getInst($(id)[0]), new Date()); var now = new Date();
var tp_inst = this._get(inst, 'timepicker');
if (tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
var tzsign = tzoffset > 0 ? '-' : '+';
tzoffset = Math.abs(tzoffset);
var tzmin = tzoffset % 60
tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
tp_inst.timezone_select.val(tzoffset);
}
this._setTime(inst, now);
$( '.ui-datepicker-today', $dp).click(); $( '.ui-datepicker-today', $dp).click();
}; };