We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent fc34147 commit bdd14b9Copy full SHA for bdd14b9
index.html
@@ -201,6 +201,9 @@ <h3>Alt Field Options</h3>
201
202
<dt>altTimeFormat</dt>
203
<dd><em>Default: (timeFormat option)</em> - The time format to use with the altField.</dd>
204
+
205
+ <dt>altAmpm</dt>
206
+ <dd><em>Default: (ampm option)</em> - Whether or not to use am/pm calculations with the altField.</dd>
207
</dl>
208
209
<h3>Timezone Options</h3>
@@ -703,11 +706,13 @@ <h3 id="alt_examples">Alternate Fields</h3>
703
706
</div>
704
707
<pre>
705
708
$('#alt_example_3').datetimepicker({
709
+ ampm: true,
710
altField: "#alt_example_3_alt",
711
altFieldTimeOnly: false,
712
altFormat: "yy-mm-dd",
- altTimeFormat: "h:m",
- altSeparator: " @ "
713
+ altTimeFormat: "h:m t",
714
+ altSeparator: " @ ",
715
+ altAmpm: false
716
});
717
</pre>
718
jquery-ui-timepicker-addon.js
@@ -94,6 +94,8 @@
94
alwaysSetTime: true,
95
separator: ' ',
96
altFieldTimeOnly: true,
97
+ altTimeFormat: null,
98
+ altAmpm: null,
99
altSeparator: null,
100
altTimeSuffix: null,
101
showTimepicker: true,
@@ -789,11 +791,13 @@
789
791
this.$input.val(formattedDateTime);
790
792
var altFormattedDateTime = '',
793
altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
- altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
794
+ altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix,
795
+ altOpts = $.extend({}, this._defaults, { ampm: (this._defaults.altAmpm !== null ? this._defaults.altAmpm : this._defaults.ampm) });
796
797
if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
798
else altFormattedDateTime = this.formattedDate;
799
if (altFormattedDateTime) altFormattedDateTime += altSeparator;
- if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
800
+ if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, altOpts) + altTimeSuffix;
801
else altFormattedDateTime += this.formattedTime + altTimeSuffix;
802
this.$altInput.val(altFormattedDateTime);
803
} else {
@@ -1296,9 +1300,11 @@
1296
1300
altFormattedDateTime = '',
1297
1301
altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
1298
1302
altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
1299
- altTimeFormat = tp_inst._defaults.altTimeFormat !== undefined ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
1303
+ altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat,
1304
+ altAmpm = tp_inst._defaults.altAmpm !== null ? tp_inst._defaults.altAmpm : tp_inst._defaults.ampm,
1305
+ altOpts = $.extend({}, tp_inst._defaults, { ampm: altAmpm });
1306
- altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
1307
+ altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, altOpts) + altTimeSuffix;
1308
if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly){
1309
if(tp_inst._defaults.altFormat)
1310
altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg) + altSeparator + altFormattedDateTime;