Skip to content

Commit 6e1b2c6

Browse files
Update to Issue trentrichardson#453 when option timeOnly
1 parent 40b1953 commit 6e1b2c6

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -644,16 +644,15 @@ <h3 id="alt_examples">Alternate Fields</h3>
644644

645645
<!-- ============= example -->
646646
<div class="example-container">
647-
<p>With inline mode:</p>
647+
<p>With inline mode using altField:</p>
648648
<div>
649649
<input type="text" name="alt_example_4_alt" id="alt_example_4_alt" value="" />
650650
<span id="alt_example_4" ></span>
651651
</div>
652652
<pre>
653-
$('#alt_example_4').datepicker({
653+
$('#alt_example_4').datetimepicker({
654654
altField: "#alt_example_4_alt",
655-
altFieldTimeOnly: false,
656-
inline: true
655+
altFieldTimeOnly: false
657656
});
658657
</pre>
659658
</div>

jquery-ui-timepicker-addon.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,22 +1274,21 @@
12741274
if(tp_inst){
12751275
var altField = tp_inst._defaults.altField;
12761276
if (altField) { // update alternate field too
1277-
var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat;
1278-
var date = this._getDate(inst);
1279-
var formatCfg = $.datepicker._getFormatConfig(inst);
1280-
var 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;
1281-
if (tp_inst._defaults.altFormat)
1282-
altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg);
1283-
else
1284-
altFormattedDateTime = tp_inst.formattedDate;
1285-
if (altFormattedDateTime)
1286-
altFormattedDateTime += altSeparator;
1287-
if (tp_inst._defaults.altTimeFormat)
1288-
altFormattedDateTime += $.datepicker.formatTime(tp_inst._defaults.altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
1289-
else
1290-
altFormattedDateTime += tp_inst.formattedTime + altTimeSuffix;
1291-
1292-
$(altField).each(function() { $(this).val(altFormattedDateTime); });
1277+
var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
1278+
date = this._getDate(inst),
1279+
formatCfg = $.datepicker._getFormatConfig(inst),
1280+
altFormattedDateTime = '',
1281+
altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
1282+
altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
1283+
altTimeFormat = tp_inst._defaults.altTimeFormat !== undefined ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
1284+
1285+
altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
1286+
if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly){
1287+
if(tp_inst._defaults.altFormat)
1288+
altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg) + altSeparator + altFormattedDateTime;
1289+
else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
1290+
}
1291+
$(altField).val(altFormattedDateTime);
12931292
}
12941293
}
12951294
else{

0 commit comments

Comments
 (0)