Fix for bug that caused 24h time to be parsed as 12h time

doublerebel · doublerebel · commit 351619dcff61 · 2010-12-18T17:49:50.000-08:00
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
@@ -194,7 +194,7 @@ $.extend(Timepicker.prototype, {
 
 			if (order.m !== -1) this.minute = Number(treg[order.m]);
 			if (order.s !== -1) this.second = Number(treg[order.s]);
-			
+
 			return true;
 
 		} else return false;
@@ -456,7 +456,7 @@ $.extend(Timepicker.prototype, {
 
 			if (hour) {
 				this.hour = parseFloat(hour).toFixed(0);
-				this.ampm = ampm;
+				if (this._defaults.ampm) this.ampm = ampm;
 			}
 			if (minute) this.minute = parseFloat(minute).toFixed(0);
 			if (second) this.second = parseFloat(second).toFixed(0);
