diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-08-11 17:39:08 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-08-11 17:39:08 -0400 |
| commit | 32730b5f0565e5e637423bed0ab400ddb3ff91f3 (patch) | |
| tree | 9b9fa589b0b17b5b7edf6909a5f8ac37ef3d0501 /src | |
| parent | 9d86a293cfb2936eb239d0b31cd32f6255b2003f (diff) | |
| download | jQuery-Timepicker-Addon-32730b5f0565e5e637423bed0ab400ddb3ff91f3.zip jQuery-Timepicker-Addon-32730b5f0565e5e637423bed0ab400ddb3ff91f3.tar.gz jQuery-Timepicker-Addon-32730b5f0565e5e637423bed0ab400ddb3ff91f3.tar.bz2 | |
Updates #213 and #622 for date defaulting to 1899
Diffstat (limited to 'src')
| -rw-r--r-- | src/docs/footer.html | 2 | ||||
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/docs/footer.html b/src/docs/footer.html index 04947c5..af20aa1 100644 --- a/src/docs/footer.html +++ b/src/docs/footer.html @@ -4,7 +4,7 @@ </div> - <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.1.min.js"></script> + <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script> <script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script> <script type="text/javascript" src="jquery-ui-timepicker-addon.js"></script> <script type="text/javascript" src="jquery-ui-sliderAccess.js"></script> diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 484ada9..de84a99 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -822,8 +822,12 @@ */ _updateDateTime: function (dp_inst) { dp_inst = this.inst || dp_inst; - //var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)), - var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)), + var dtTmp = (dp_inst.currentYear > 0? + new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) : + new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)), + dt = $.datepicker._daylightSavingAdjust(dtTmp), + //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)), + //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)), dateFmt = $.datepicker._get(dp_inst, 'dateFormat'), formatCfg = $.datepicker._getFormatConfig(dp_inst), timeAvailable = dt !== null && this.timeDefined; |