#843 and #845 - fix for clicking Now button

trentrichardson · Nov 23, 2015 · bdafae6 · bdafae6
1 parent 4aac8f1
commit bdafae6
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/dist/i18n/jquery-ui-timepicker-addon-i18n.js b/dist/i18n/jquery-ui-timepicker-addon-i18n.js
@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
+/*! jQuery Timepicker Addon - v1.6.2 - 2015-11-14
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 

diff --git a/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js b/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js
diff --git a/dist/index.html b/dist/index.html
@@ -113,7 +113,7 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.6.1</p>
+	<p>Version 1.6.2</p>
 
 	<p>Last updated on 2015-11-14</p>
 	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>

diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
+/*! jQuery Timepicker Addon - v1.6.2 - 2015-11-14
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 (function (factory) {
@@ -22,7 +22,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.6.1"
+			version: "1.6.2"
 		}
 	});
 
@@ -2059,10 +2059,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
@@ -2258,6 +2262,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.6.1";
+	$.timepicker.version = "1.6.2";
 
 }));
diff --git a/dist/jquery-ui-timepicker-addon.min.css b/dist/jquery-ui-timepicker-addon.min.css
diff --git a/dist/jquery-ui-timepicker-addon.min.js b/dist/jquery-ui-timepicker-addon.min.js
diff --git 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