diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-11-10 15:36:56 -0500 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-11-10 15:36:56 -0500 |
| commit | c892bd361abf42ac87533dd245d12baacc13935e (patch) | |
| tree | e558a3dc0d32c3f892b4f5a658f9174a541648c9 /src/jquery-ui-timepicker-addon.js | |
| parent | 18de616243dae142bcef4c7bcbe050348454ca57 (diff) | |
| parent | fe684fac3d3de25b31950d3cdf7c72c6c5e59fce (diff) | |
| download | jQuery-Timepicker-Addon-c892bd361abf42ac87533dd245d12baacc13935e.zip jQuery-Timepicker-Addon-c892bd361abf42ac87533dd245d12baacc13935e.tar.gz jQuery-Timepicker-Addon-c892bd361abf42ac87533dd245d12baacc13935e.tar.bz2 | |
Merge branch 'dev'
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index de84a99..a34d486 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -749,6 +749,9 @@ if (microsec !== false) { microsec = parseInt(microsec, 10); } + if (timezone !== false) { + timezone = parseInt(timezone, 10); + } var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0]; @@ -835,7 +838,7 @@ var formattedDateTime = this.formattedDate; // if a slider was changed but datepicker doesn't have a value yet, set it - if (dp_inst.lastVa === "") { + if (dp_inst.lastVal === "") { dp_inst.currentYear = dp_inst.selectedYear; dp_inst.currentMonth = dp_inst.selectedMonth; dp_inst.currentDay = dp_inst.selectedDay; |