summaryrefslogtreecommitdiffstats
path: root/dist/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent <trentdrichardson@gmail.com>2015-11-23 17:01:29 -0500
committerTrent <trentdrichardson@gmail.com>2015-11-23 17:01:29 -0500
commitdc3d12ae389c03c732e7ce3f4f36e81b7feb48cb (patch)
treecf168fb07e5695ad4cabc786f946ad4baa319a1e /dist/jquery-ui-timepicker-addon.js
parentbdafae62067d0780d68b4b39ae1a2dc7675b4ad9 (diff)
downloadjQuery-Timepicker-Addon-dc3d12ae389c03c732e7ce3f4f36e81b7feb48cb.zip
jQuery-Timepicker-Addon-dc3d12ae389c03c732e7ce3f4f36e81b7feb48cb.tar.gz
jQuery-Timepicker-Addon-dc3d12ae389c03c732e7ce3f4f36e81b7feb48cb.tar.bz2
#843 and #845 - fix for clicking Now - removes any partial support for alpha timezones.
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
-rw-r--r--dist/jquery-ui-timepicker-addon.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
index c5fa847..d6c362d 100644
--- a/dist/jquery-ui-timepicker-addon.js
+++ b/dist/jquery-ui-timepicker-addon.js
@@ -2059,11 +2059,7 @@
return 0;
}
- if(/^[a-zA-Z -]+$/.test(normalized)){ // possibly a user defined tz, so just give it back
- return tzString;
- }
-
- if (!/^(\-|\+)\d{4}$/.test(normalized)) {
+ if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
return parseInt(tzString, 10);
}