diff options
| author | Trent <trentdrichardson@gmail.com> | 2015-11-23 16:57:56 -0500 |
|---|---|---|
| committer | Trent <trentdrichardson@gmail.com> | 2015-11-23 16:57:56 -0500 |
| commit | bdafae62067d0780d68b4b39ae1a2dc7675b4ad9 (patch) | |
| tree | 6ca790dd17a5f1848f352a1018cd0d486c6f475d /src/jquery-ui-timepicker-addon.js | |
| parent | 4aac8f1dd285399e926de57c708830cbd7607d05 (diff) | |
| download | jQuery-Timepicker-Addon-bdafae62067d0780d68b4b39ae1a2dc7675b4ad9.zip jQuery-Timepicker-Addon-bdafae62067d0780d68b4b39ae1a2dc7675b4ad9.tar.gz jQuery-Timepicker-Addon-bdafae62067d0780d68b4b39ae1a2dc7675b4ad9.tar.bz2 | |
#843 and #845 - fix for clicking Now button
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 79de1e3..6ba792e 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -2065,10 +2065,14 @@ return 0; } - if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back + if(/^[a-zA-Z -]+$/.test(normalized)){ // possibly a user defined tz, so just give it back return tzString; } + if (!/^(\-|\+)\d{4}$/.test(normalized)) { + return parseInt(tzString, 10); + } + return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus ((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes) parseInt(normalized.substr(3, 2), 10))); // minutes |