Add altAmpm option

2 files changed, 17 insertions, 6 deletions

diff --git a/index.html b/index.html
index 833fa96..436853d 100644
--- a/index.html
+++ b/index.html
@@ -201,6 +201,9 @@
 
 						<dt>altTimeFormat</dt>
 							<dd><em>Default: (timeFormat option)</em> - The time format to use with the altField.</dd>
+
+						<dt>altAmpm</dt>
+							<dd><em>Default: (ampm option)</em> - Whether or not to use am/pm calculations with the altField.</dd>
 					</dl>
 
 					<h3>Timezone Options</h3>
@@ -703,11 +706,13 @@ $('#alt_example_2').datetimepicker({
 						</div>					
 <pre>
 $('#alt_example_3').datetimepicker({
+	ampm: true,
 	altField: "#alt_example_3_alt",
 	altFieldTimeOnly: false,
 	altFormat: "yy-mm-dd",
-	altTimeFormat: "h:m",
-	altSeparator: " @ "
+	altTimeFormat: "h:m t",
+	altSeparator: " @ ",
+	altAmpm: false
 });
 </pre>
 					</div>
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 451c5e8..47877e8 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -94,6 +94,8 @@
 			alwaysSetTime: true,

 			separator: ' ',

 			altFieldTimeOnly: true,

+			altTimeFormat: null,

+			altAmpm: null,

 			altSeparator: null,

 			altTimeSuffix: null,

 			showTimepicker: true,

@@ -789,11 +791,13 @@
 				this.$input.val(formattedDateTime);

 				var altFormattedDateTime = '',

 					altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,

-					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;

+					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix,

+					altOpts = $.extend({}, this._defaults, { ampm: (this._defaults.altAmpm !== null ? this._defaults.altAmpm : this._defaults.ampm) });

+

 				if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);

 				else altFormattedDateTime = this.formattedDate;

 				if (altFormattedDateTime) altFormattedDateTime += altSeparator;

-				if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;

+				if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, altOpts) + altTimeSuffix;

 				else altFormattedDateTime += this.formattedTime + altTimeSuffix;

 				this.$altInput.val(altFormattedDateTime);

 			} else {

@@ -1296,9 +1300,11 @@
 					altFormattedDateTime = '', 

 					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 

 					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,

-					altTimeFormat = tp_inst._defaults.altTimeFormat !== undefined ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;

+					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat,

+					altAmpm = tp_inst._defaults.altAmpm !== null ? tp_inst._defaults.altAmpm : tp_inst._defaults.ampm,

+					altOpts = $.extend({}, tp_inst._defaults, { ampm: altAmpm });

 				

-				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;

+				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, altOpts) + altTimeSuffix;

 				if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly){

 					if(tp_inst._defaults.altFormat)

 						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg) + altSeparator + altFormattedDateTime;