diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-02 09:26:15 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-02 09:26:15 -0400 |
| commit | 6e1b2c63a97796f3d0900a8fdeee738183d8921d (patch) | |
| tree | bb3b89390c1e871401aa9549969892bd33c0b198 /jquery-ui-timepicker-addon.js | |
| parent | 40b1953e35d1df08648ce1268bc4350e1ddf085b (diff) | |
| download | jQuery-Timepicker-Addon-6e1b2c63a97796f3d0900a8fdeee738183d8921d.zip jQuery-Timepicker-Addon-6e1b2c63a97796f3d0900a8fdeee738183d8921d.tar.gz jQuery-Timepicker-Addon-6e1b2c63a97796f3d0900a8fdeee738183d8921d.tar.bz2 | |
Update to Issue #453 when option timeOnly
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index aae9e88..5e3c448 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1274,22 +1274,21 @@ if(tp_inst){
var altField = tp_inst._defaults.altField;
if (altField) { // update alternate field too
- var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat;
- var date = this._getDate(inst);
- var formatCfg = $.datepicker._getFormatConfig(inst);
- 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;
- if (tp_inst._defaults.altFormat)
- altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg);
- else
- altFormattedDateTime = tp_inst.formattedDate;
- if (altFormattedDateTime)
- altFormattedDateTime += altSeparator;
- if (tp_inst._defaults.altTimeFormat)
- altFormattedDateTime += $.datepicker.formatTime(tp_inst._defaults.altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
- else
- altFormattedDateTime += tp_inst.formattedTime + altTimeSuffix;
-
- $(altField).each(function() { $(this).val(altFormattedDateTime); });
+ var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+ date = this._getDate(inst),
+ formatCfg = $.datepicker._getFormatConfig(inst),
+ 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;
+
+ altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + 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;
+ else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+ }
+ $(altField).val(altFormattedDateTime);
}
}
else{
|